From: Frank Karlitschek Date: Fri, 8 Jun 2012 09:50:08 +0000 (+0200) Subject: Merge branch 'master' of gitorious.org:owncloud/owncloud X-Git-Tag: v4.5.0beta1~74^2~422^2~47 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6a24e8279fbff2e6c10379637676461e72387102;p=nextcloud-server.git Merge branch 'master' of gitorious.org:owncloud/owncloud --- 6a24e8279fbff2e6c10379637676461e72387102