Merge remote-tracking branch 'origin/development'
authorpk910 <philipp@zoelle1.de>
Mon, 26 Nov 2012 13:25:59 +0000 (14:25 +0100)
committerpk910 <philipp@zoelle1.de>
Mon, 26 Nov 2012 13:25:59 +0000 (14:25 +0100)

Trivial merge