From: hama <hama@siduction.net>
Date: Mon, 22 Sep 2014 06:51:41 +0000 (+0200)
Subject: Merge branch 'master' of f-r-e-i.de:/home/git/repo/jkurs
X-Git-Url: https://gitweb.hamatoma.de/?a=commitdiff_plain;h=861cf6de924a3970fddf4428526f5203aedff532;p=jkurs

Merge branch 'master' of f-r-e-i.de:/home/git/repo/jkurs
---

861cf6de924a3970fddf4428526f5203aedff532