From: Frank Karlitschek Date: Sat, 21 Apr 2012 20:50:30 +0000 (+0200) Subject: Merge branch 'master' of gitorious.org:owncloud/owncloud X-Git-Tag: v4.0.0beta~244 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=fd5479195246a75c4f53a515a2be76bb151f2260;p=nextcloud-server.git Merge branch 'master' of gitorious.org:owncloud/owncloud --- fd5479195246a75c4f53a515a2be76bb151f2260