Merge branch 'master' of https://git.tine20.org/git/tine20
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 15 Jun 2011 13:53:49 +0000 (15:53 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 15 Jun 2011 13:53:49 +0000 (15:53 +0200)

Trivial merge