From: Côme BERNIGAUD <come.bernigaud@laposte.net>
Date: Thu, 25 Aug 2011 15:03:56 +0000 (+0200)
Subject: Merge branch 'master' of git://anongit.kde.org/owncloud
X-Git-Tag: v3.0~267^2~37^2~3
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ad053d504ca0d4ce1bd15514e60fd344e8dbc293;p=nextcloud-server.git

Merge branch 'master' of git://anongit.kde.org/owncloud
---

ad053d504ca0d4ce1bd15514e60fd344e8dbc293