From: Georg Ehrke Date: Sun, 22 Apr 2012 11:20:50 +0000 (+0200) Subject: Merge branch 'master' into sabredav_1.6 X-Git-Tag: v4.0.0beta~201^2 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e888f4d9bc40dddd197f858d3fe585df631189b6;p=nextcloud-server.git Merge branch 'master' into sabredav_1.6 --- e888f4d9bc40dddd197f858d3fe585df631189b6