Merge branch 'master' of https://git.tine20.org/git/tine20
authorAlexander Stintzing <alex@stintzing.net>
Tue, 3 Jan 2012 18:10:54 +0000 (19:10 +0100)
committerAlexander Stintzing <alex@stintzing.net>
Tue, 3 Jan 2012 18:10:54 +0000 (19:10 +0100)

Trivial merge