From: Robin McCorkell <rmccorkell@karoshi.org.uk>
Date: Thu, 17 Apr 2014 10:56:51 +0000 (+0100)
Subject: Merge pull request #8189 from Xenopathic/misc_fixes
X-Git-Tag: v7.0.0alpha2~409
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=13b463cc176cb547f2b5585e974c9357150585a2;p=nextcloud-server.git

Merge pull request #8189 from Xenopathic/misc_fixes

Various fixes
---

13b463cc176cb547f2b5585e974c9357150585a2