From: Florian Hülsmann Date: Mon, 18 Jun 2012 11:37:25 +0000 (+0200) Subject: Merge branch 'master' of gitorious.org:owncloud/owncloud X-Git-Tag: v4.5.0beta1~74^2~412^2 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7064f3a8a8e249b62bd8b6a018cf6d79b7ae133c;p=nextcloud-server.git Merge branch 'master' of gitorious.org:owncloud/owncloud --- 7064f3a8a8e249b62bd8b6a018cf6d79b7ae133c