Merge branch 'calendar' of git://anongit.kde.org/owncloud into calendar
authorJan-Christoph Borchardt <JanCBorchardt@fsfe.org>
Tue, 30 Aug 2011 19:01:10 +0000 (21:01 +0200)
committerJan-Christoph Borchardt <JanCBorchardt@fsfe.org>
Tue, 30 Aug 2011 19:01:10 +0000 (21:01 +0200)
commitf758d223a2a813e3b2a2f05ba79c902ab10d8288
tree02b08663d822a8170c3a0666f0c5506f367e376c
parent60a5581071e536defc06d9bb2290c7f4be39b8ac
parent6ad64c6f8a0f249357baa1dd897bbef733770432
Merge branch 'calendar' of git://anongit.kde.org/owncloud into calendar