Merge branch 'master' of https://git.tine20.org:443/git/tine20
authorLars Kneschke <l.kneschke@metaways.de>
Fri, 13 Jan 2012 19:56:55 +0000 (20:56 +0100)
committerLars Kneschke <l.kneschke@metaways.de>
Fri, 13 Jan 2012 19:56:55 +0000 (20:56 +0100)
commit575b9dc03f2271af99c317fe68b29aec523612a3
treee57994732b76f5606ebdde7eddc2b3f6d038af0b
parentc8e51977bce20a6159fe3c0fcf2fed5b5f34df39
parente5bc58618922006b4f4df06a2d644ff422678e29
Merge branch 'master' of https://git.tine20.org:443/git/tine20