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)
commit934a4c458c47d8bc02056330257403e0081b787f
treed20aaf508cf0dfb57493181c233d0c2e6118766a
parentf2519d3dc1c6677386e7f8f24cd10033fd0f9f07
parent9999179b06949feb02eba2b5644253ea53fe2fd8
Merge branch 'master' of https://git.tine20.org/git/tine20