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)
commit7bc0cfc8c4f40b6e008c17131384e054cff1690a
tree51bd36daa7933fc6d17f6aeba14c3c20cbe989ff
parent4e0a556f75a0e4592cb05de795eabfa3d45e3332
parent4b976e77c40fd5a24cbd5ecaf0ae0fe922b05a6b
Merge branch 'master' of danielabrecht.ch:/var/cache/git/knw_133