Merge branch 'master' of https://git.tine20.org/git/tine20
authorAlexander Stintzing <alex@stintzing.net>
Wed, 14 Dec 2011 15:40:14 +0000 (16:40 +0100)
committerAlexander Stintzing <alex@stintzing.net>
Wed, 14 Dec 2011 15:40:14 +0000 (16:40 +0100)
commit71704d458ed727dd42211d7cd5795a013be8b9fa
tree6939cfd718baaffe6177fcda005414d6c3f68da1
parenta75ef07759bc55428361d2a63bd00af910bfe074
parent81569fa1627a848eafa770c9e9d097527a73ef3e
Merge branch 'master' of https://git.tine20.org/git/tine20