From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Sat, 27 Aug 2011 15:57:26 +0000 (-0400)
Subject: Merge branch 'master' of git://anongit.kde.org/owncloud
X-Git-Tag: v3.0~267^2~35
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=88e7939364614878250229f6deea87839cc989a6;p=nextcloud-server.git

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

88e7939364614878250229f6deea87839cc989a6