From: Marvin Thomas Rabe Date: Mon, 3 Oct 2011 12:47:41 +0000 (+0200) Subject: Merge branch 'master' of git://gitorious.org/owncloud/owncloud X-Git-Tag: v3.0~123^2~4 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=baf2fa3a9f7214632f518eb90c2c21af7ab6c942;p=nextcloud-server.git Merge branch 'master' of git://gitorious.org/owncloud/owncloud --- baf2fa3a9f7214632f518eb90c2c21af7ab6c942