From: Sam Tuke <samtuke@jack-laptop.(none)>
Date: Fri, 27 Apr 2012 12:23:58 +0000 (+0100)
Subject: Merge branch 'master' of gitorious.org:owncloud/owncloud
X-Git-Tag: v4.0.0beta~168
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=a1b309a42adb3090782c602960e9b96e6ae6e858;p=nextcloud-server.git

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

a1b309a42adb3090782c602960e9b96e6ae6e858