From: Florian Pritz <bluewind@xinu.at>
Date: Sat, 24 Sep 2011 16:43:02 +0000 (+0200)
Subject: Merge branch 'working'
X-Git-Tag: v3.0~161
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=793e29e1245d079f89505294bef47f01c9111e8b;p=nextcloud-server.git

Merge branch 'working'
---

793e29e1245d079f89505294bef47f01c9111e8b