Merge branch 'master' of danielabrecht.ch:/var/cache/git/knw_133 master origin/HEAD origin/master
authordaniel <daniel@danielabrecht.ch>
Sun, 13 Dec 2015 17:26:33 +0000 (18:26 +0100)
committerdaniel <daniel@danielabrecht.ch>
Sun, 13 Dec 2015 17:26:33 +0000 (18:26 +0100)

Trivial merge