Merge branch 'master' of ssh://git.pk910.de:16110/srvx
authorpk910 <philipp@zoelle1.de>
Tue, 7 Feb 2012 13:20:11 +0000 (14:20 +0100)
committerpk910 <philipp@zoelle1.de>
Tue, 7 Feb 2012 13:20:11 +0000 (14:20 +0100)

Trivial merge