![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Claudius Zingerli <githubkszmail@zeuz.ch> | |
| Wed, 20 Jan 2016 16:15:04 +0000 (17:15 +0100) | ||
| committer | Claudius Zingerli <githubkszmail@zeuz.ch> | |
| Wed, 20 Jan 2016 16:15:04 +0000 (17:15 +0100) | ||
| commit | e6fa7293d20e9f987dd36a7de76436c6c79c240b | |
| tree | dda9d07bbb515e063a6fe565b05588d495d55745 | tree | snapshot |
| parent | b1b0aa549005c62b0e4651053198693e33ea84f0 | commit | diff |
| parent | 9c8f3110063cf83fa146929d5f28f8ecf17a4ffd | commit | diff |
Merge remote-tracking branch 'upstream/master'