]> gitweb.hamatoma.de Git - jkurs/commitdiff
Merge branch 'master' of f-r-e-i.de:/home/git/repo/jkurs
authorhama <hama@siduction.net>
Mon, 22 Sep 2014 06:51:41 +0000 (08:51 +0200)
committerhama <hama@siduction.net>
Mon, 22 Sep 2014 06:51:41 +0000 (08:51 +0200)

Trivial merge