Merge branch 'master' of https://git.tine20.org:443/git/tine20
authorLars Kneschke <l.kneschke@metaways.de>
Thu, 5 Jan 2012 05:23:44 +0000 (06:23 +0100)
committerLars Kneschke <l.kneschke@metaways.de>
Thu, 5 Jan 2012 05:23:44 +0000 (06:23 +0100)

Trivial merge