Merge branch 'master' of ssh://git.pk910.de:16110/srvx
authorpk910 <philipp@zoelle1.de>
Tue, 27 Aug 2013 20:21:03 +0000 (22:21 +0200)
committerpk910 <philipp@zoelle1.de>
Tue, 27 Aug 2013 20:21:03 +0000 (22:21 +0200)

Trivial merge