Merge branch 'master' of ssh://git.pk910.de:16110/srvx
authorpk910 <philipp@zoelle1.de>
Sat, 3 Mar 2012 08:54:30 +0000 (09:54 +0100)
committerpk910 <philipp@zoelle1.de>
Sat, 3 Mar 2012 08:54:30 +0000 (09:54 +0100)

Trivial merge