Merge branch 'master' of https://git.tine20.org/git/tine20
authorAlexander Stintzing <alex@stintzing.net>
Tue, 3 Jan 2012 18:10:54 +0000 (19:10 +0100)
committerAlexander Stintzing <alex@stintzing.net>
Tue, 3 Jan 2012 18:10:54 +0000 (19:10 +0100)
commit32497ce557dd9869cf3856a757a9061bdf55a80f
tree53dd52b72f86ad76b759e6f64af77282684766f7
parent62a274bf694fc4b73d5e649bbc75800c41cf837c
parentd024f9701e3a9d9cdd3a1ed264bd506c10dc8188
Merge branch 'master' of https://git.tine20.org/git/tine20