Merge remote-tracking branch 'origin/development'
authorpk910 <philipp@zoelle1.de>
Fri, 7 Sep 2012 17:18:22 +0000 (19:18 +0200)
committerpk910 <philipp@zoelle1.de>
Fri, 7 Sep 2012 17:18:22 +0000 (19:18 +0200)

Trivial merge