Merge branch 'master' of https://git.tine20.org/git/tine20
authorAlexander Stintzing <alex@stintzing.net>
Wed, 4 Jan 2012 14:09:47 +0000 (15:09 +0100)
committerAlexander Stintzing <alex@stintzing.net>
Wed, 4 Jan 2012 14:09:47 +0000 (15:09 +0100)

Trivial merge