Merge branch 'master' of https://git.tine20.org:443/git/tine20
authorLars Kneschke <l.kneschke@metaways.de>
Sun, 15 Jan 2012 10:58:33 +0000 (11:58 +0100)
committerLars Kneschke <l.kneschke@metaways.de>
Sun, 15 Jan 2012 10:58:33 +0000 (11:58 +0100)

Trivial merge