Merge branch 'master' of https://git.tine20.org/git/tine20
authorAlexander Stintzing <alex@stintzing.net>
Wed, 14 Dec 2011 15:40:14 +0000 (16:40 +0100)
committerAlexander Stintzing <alex@stintzing.net>
Wed, 14 Dec 2011 15:40:14 +0000 (16:40 +0100)

Trivial merge