From: Scott Barnett <scott.n.barnett@gmail.com>
Date: Mon, 26 Sep 2011 19:49:49 +0000 (+1000)
Subject: Merge branch 'master' of git://gitorious.org/owncloud/owncloud
X-Git-Tag: v3.0~139
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=861ef363a5fa04d8eea71689aeba8117958252dd;p=nextcloud-server.git

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

861ef363a5fa04d8eea71689aeba8117958252dd