From: Marvin Thomas Rabe <m.rabe@echtzeitraum.de>
Date: Thu, 6 Oct 2011 20:37:06 +0000 (+0200)
Subject: Merge commit 'refs/merge-requests/55' of git://gitorious.org/owncloud/owncloud into... 
X-Git-Tag: v3.0~101^2~2^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=bb26fe93008bd6fd5031956d654a5ab9c1950416;p=nextcloud-server.git

Merge commit 'refs/merge-requests/55' of git://gitorious.org/owncloud/owncloud into merge-requests/55
---

bb26fe93008bd6fd5031956d654a5ab9c1950416