Merge branch 'master' of https://git.tine20.org:443/git/tine20
authorLars Kneschke <l.kneschke@metaways.de>
Tue, 3 Jan 2012 15:32:37 +0000 (16:32 +0100)
committerLars Kneschke <l.kneschke@metaways.de>
Tue, 3 Jan 2012 15:32:37 +0000 (16:32 +0100)
commitd024f9701e3a9d9cdd3a1ed264bd506c10dc8188
tree6cfaff4c1600cabf27715c7b4632405a69912c84
parentbc81e1c914761e3b298058be54d0c98eb32d9ed5
parent0a6301b228b751fc37602180fbd6abb688bec208
Merge branch 'master' of https://git.tine20.org:443/git/tine20