Merge branch 'master' of https://git.tine20.org:443/git/tine20
authorLars Kneschke <l.kneschke@metaways.de>
Sun, 15 Jan 2012 10:58:33 +0000 (11:58 +0100)
committerLars Kneschke <l.kneschke@metaways.de>
Sun, 15 Jan 2012 10:58:33 +0000 (11:58 +0100)
commit9a6a915ce169052218549b1054fb16559e8fe273
tree87838bb1b970b9893eb5f19f67f19f4b66530a4f
parentf9620492bbc7c42c0c13ed3a2a9123bad88524a2
parent4ee3f6a8d9a42e38053139feb08e46e8c0162b1c
Merge branch 'master' of https://git.tine20.org:443/git/tine20