From: Robin Appelman Date: Thu, 19 Dec 2013 14:57:04 +0000 (+0100) Subject: Merge branch 'master' into user-no-change-displayname X-Git-Tag: v7.0.0alpha2~976^2~1 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=321d96135385cd4b8941ad49555bb7612e5cbddf;p=nextcloud-server.git Merge branch 'master' into user-no-change-displayname --- 321d96135385cd4b8941ad49555bb7612e5cbddf