Merge branch 'master' of ssh://git.pk910.de:16110/NeonServV5
authorpk910 <philipp@zoelle1.de>
Wed, 4 Jan 2012 22:40:34 +0000 (23:40 +0100)
committerpk910 <philipp@zoelle1.de>
Wed, 4 Jan 2012 22:40:34 +0000 (23:40 +0100)

Trivial merge