Merge branch 'development'
authorpk910 <philipp@zoelle1.de>
Wed, 13 Feb 2013 19:19:47 +0000 (20:19 +0100)
committerpk910 <philipp@zoelle1.de>
Wed, 13 Feb 2013 19:19:47 +0000 (20:19 +0100)

Trivial merge