Merge branch 'master' of ssh://git.pk910.de:16110/PHP-P10 master
authorpk910 <philipp@zoelle1.de>
Mon, 29 Jul 2013 22:11:15 +0000 (00:11 +0200)
committerpk910 <philipp@zoelle1.de>
Mon, 29 Jul 2013 22:11:15 +0000 (00:11 +0200)

Trivial merge