Merge branch 'master' of https://git.tine20.org:443/git/tine20
authorLars Kneschke <l.kneschke@metaways.de>
Tue, 3 Jan 2012 15:32:37 +0000 (16:32 +0100)
committerLars Kneschke <l.kneschke@metaways.de>
Tue, 3 Jan 2012 15:32:37 +0000 (16:32 +0100)

Trivial merge