From: Georg Ehrke <georg.stefan.germany@googlemail.com>
Date: Sat, 24 Sep 2011 17:53:37 +0000 (+0200)
Subject: Merge branch 'master' of gitorious.org:owncloud/owncloud
X-Git-Tag: v3.0~159
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=da63140b0487f1702e3d652f88dcfc0f49e45bd7;p=nextcloud-server.git

Merge branch 'master' of gitorious.org:owncloud/owncloud
---

da63140b0487f1702e3d652f88dcfc0f49e45bd7