Merge remote-tracking branch 'origin/development'
authorpk910 <philipp@zoelle1.de>
Sat, 3 Nov 2012 14:23:10 +0000 (15:23 +0100)
committerpk910 <philipp@zoelle1.de>
Sat, 3 Nov 2012 14:23:10 +0000 (15:23 +0100)

Trivial merge