Merge branch 'master' of https://git.tine20.org:443/git/tine20
authorLars Kneschke <l.kneschke@metaways.de>
Sat, 31 Dec 2011 06:23:07 +0000 (07:23 +0100)
committerLars Kneschke <l.kneschke@metaways.de>
Sat, 31 Dec 2011 06:23:07 +0000 (07:23 +0100)
commitce2125ff5b363e7a4656f018530e4e99946dfe9e
tree7158607a2c5a272813f22042d7837d15fa4f427d
parentfd0b17d9892b3ee0d5fe59d70583ceab5a32db71
parentd04dc92d82a6d038f3dc799e02875dd9668d327f
Merge branch 'master' of https://git.tine20.org:443/git/tine20
tine20/ActiveSync/Controller/Abstract.php