From: kondou <kondou@ts.unde.re>
Date: Wed, 11 Sep 2013 14:35:55 +0000 (+0200)
Subject: Merge branch 'master' into split_personal-user_passwordchange
X-Git-Tag: v6.0.0alpha2~164^2~3
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=2ae3ab98d847cbf795ee038b468376d53b069e0a;p=nextcloud-server.git

Merge branch 'master' into split_personal-user_passwordchange
---

2ae3ab98d847cbf795ee038b468376d53b069e0a