From: Bjoern Schiessle Date: Tue, 26 Jun 2012 14:30:34 +0000 (+0200) Subject: Merge branch 'master' of gitorious.org:owncloud/owncloud X-Git-Tag: v4.5.0beta1~74^2~49^2~160 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=de4a540ce6349e7f901be412fb24899b188b3414;p=nextcloud-server.git Merge branch 'master' of gitorious.org:owncloud/owncloud --- de4a540ce6349e7f901be412fb24899b188b3414