From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Wed, 13 Feb 2013 00:18:01 +0000 (+0100)
Subject: Merge branch 'master' into fixing-1424-master
X-Git-Tag: v5.0.0beta1~51^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=bc43dd704fc89188faadb42d313a41f8b2929c0c;p=nextcloud-server.git

Merge branch 'master' into fixing-1424-master

Conflicts:
	settings/js/users.js
---

bc43dd704fc89188faadb42d313a41f8b2929c0c