From: Frank Karlitschek Date: Mon, 28 May 2012 11:59:47 +0000 (+0200) Subject: Merge branch 'master' of gitorious.org:owncloud/owncloud X-Git-Tag: v4.5.0beta1~74^2~428^2~3 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=1eebbaebdb8d36564c07e616d74dd7fac0929c46;p=nextcloud-server.git Merge branch 'master' of gitorious.org:owncloud/owncloud --- 1eebbaebdb8d36564c07e616d74dd7fac0929c46