Merge branch 'master' of https://gerrit.tine20.org/tine20/p/tine20.git
authorLars Kneschke <l.kneschke@metaways.de>
Wed, 22 Feb 2012 15:29:39 +0000 (16:29 +0100)
committerLars Kneschke <l.kneschke@metaways.de>
Wed, 22 Feb 2012 15:29:39 +0000 (16:29 +0100)

Trivial merge