From: kondou <kondou@ts.unde.re>
Date: Fri, 28 Feb 2014 18:28:29 +0000 (+0100)
Subject: Merge branch 'master' into hide_remove_image_avatar
X-Git-Tag: v7.0.0alpha2~630^2~3
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3c11dc0006d5a3722b37bed274d8d19be219b6b2;p=nextcloud-server.git

Merge branch 'master' into hide_remove_image_avatar
---

3c11dc0006d5a3722b37bed274d8d19be219b6b2