Merge branch 'master' of https://git.tine20.org/git/tine20
authorAlexander Stintzing <alex@stintzing.net>
Sat, 14 Jan 2012 12:37:38 +0000 (13:37 +0100)
committerAlexander Stintzing <alex@stintzing.net>
Sat, 14 Jan 2012 12:37:38 +0000 (13:37 +0100)

Trivial merge