From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Sun, 10 Jul 2011 20:00:31 +0000 (-0400)
Subject: Merge branch 'master' of git://anongit.kde.org/owncloud
X-Git-Tag: v3.0~267^2~415
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=89a6f16e8d03af8e9527ead0b17db119344c83d4;p=nextcloud-server.git

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

89a6f16e8d03af8e9527ead0b17db119344c83d4