From: Thomas Müller Date: Tue, 21 Jan 2014 18:36:20 +0000 (+0100) Subject: Merge branch 'master' into fixing-gallery-password-protected-access-master X-Git-Tag: v7.0.0alpha2~903^2 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=9bab05fd45434a62c9c017d73d74c1fe1928ead0;p=nextcloud-server.git Merge branch 'master' into fixing-gallery-password-protected-access-master --- 9bab05fd45434a62c9c017d73d74c1fe1928ead0