From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Thu, 17 May 2012 19:39:39 +0000 (-0400)
Subject: Merge branch 'merge-requests/115'
X-Git-Tag: v4.0.0RC2~17
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=57d41bb1f8e418e62718cc18013d153f5eb35107;p=nextcloud-server.git

Merge branch 'merge-requests/115'
---

57d41bb1f8e418e62718cc18013d153f5eb35107