Merge branch 'master' of https://gerrit.tine20.org/tine20/p/tine20.git 2012-03-1-beta3
authorLars Kneschke <l.kneschke@metaways.de>
Fri, 10 Feb 2012 13:39:30 +0000 (14:39 +0100)
committerLars Kneschke <l.kneschke@metaways.de>
Fri, 10 Feb 2012 13:39:30 +0000 (14:39 +0100)

Trivial merge