Merge branch 'master' of https://git.tine20.org:443/git/tine20
authorLars Kneschke <l.kneschke@metaways.de>
Tue, 3 Jan 2012 13:58:14 +0000 (14:58 +0100)
committerLars Kneschke <l.kneschke@metaways.de>
Tue, 3 Jan 2012 13:58:14 +0000 (14:58 +0100)
commit938852b3079346509c8d3c7c16c6da5ed6b71b11
tree2e233b3a64c4db38211ad6b8057c66f3a448c588
parentc050c6590098d116332af9d8e12fa0a1f7eb113f
parent447be69106d16a5b3cbf5dc6f50b674155987209
Merge branch 'master' of https://git.tine20.org:443/git/tine20