From: Thomas Müller <thomas.mueller@tmit.eu>
Date: Mon, 30 Sep 2013 18:21:51 +0000 (+0200)
Subject: Merge branch 'master' into channels
X-Git-Tag: v6.0.0alpha2~117^2~3
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=bed27b603de1b5eb736d123fd58b774c7f79a4fd;p=nextcloud-server.git

Merge branch 'master' into channels

Conflicts:
	lib/util.php
---

bed27b603de1b5eb736d123fd58b774c7f79a4fd