Merge branch 'master' of https://git.tine20.org/git/tine20
authorCornelius Weiß <mail@corneliusweiss.de>
Wed, 13 Apr 2011 12:26:49 +0000 (14:26 +0200)
committerCornelius Weiß <mail@corneliusweiss.de>
Wed, 13 Apr 2011 12:26:49 +0000 (14:26 +0200)

Trivial merge