From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Sun, 25 Sep 2011 20:32:16 +0000 (+0200)
Subject: Merge branch 'master' of git://gitorious.org/owncloud/owncloud
X-Git-Tag: v3.0~143
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=63e6863222b92d7fc2e6ca5ccb3ab79688594348;p=nextcloud-server.git

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

63e6863222b92d7fc2e6ca5ccb3ab79688594348