Merge remote-tracking branch 'origin/development'
authorpk910 <philipp@zoelle1.de>
Fri, 19 Oct 2012 12:10:05 +0000 (14:10 +0200)
committerpk910 <philipp@zoelle1.de>
Fri, 19 Oct 2012 12:10:05 +0000 (14:10 +0200)

Trivial merge