From: Jakob Sack <kde@jakobsack.de>
Date: Fri, 22 Jul 2011 21:18:08 +0000 (+0200)
Subject: Merge branch 'sabredav'
X-Git-Tag: v3.0~267^2~383
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3097e4f48a5490de6e55a21b9ee66b2a7b4ae26d;p=nextcloud-server.git

Merge branch 'sabredav'
---

3097e4f48a5490de6e55a21b9ee66b2a7b4ae26d