From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Sun, 18 Sep 2011 13:06:51 +0000 (+0200)
Subject: Merge branch 'master' of git://gitorious.org/owncloud/owncloud
X-Git-Tag: v3.0~180
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6e980d419c0c93b606858b1a907818c5aa386524;p=nextcloud-server.git

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

6e980d419c0c93b606858b1a907818c5aa386524