Merge remote-tracking branch 'origin/development'
authorpk910 <philipp@zoelle1.de>
Wed, 19 Dec 2012 13:34:00 +0000 (14:34 +0100)
committerpk910 <philipp@zoelle1.de>
Wed, 19 Dec 2012 13:34:00 +0000 (14:34 +0100)

Trivial merge