From: Thomas Müller <thomas.mueller@tmit.eu>
Date: Sun, 4 Aug 2013 22:25:22 +0000 (+0200)
Subject: Merge branch 'stable5' of github.com:owncloud/core into stable5
X-Git-Tag: v5.0.10~16
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f4e94a46cb7d25da899c460840d9327e2542af5e;p=nextcloud-server.git

Merge branch 'stable5' of github.com:owncloud/core into stable5
---

f4e94a46cb7d25da899c460840d9327e2542af5e