From: kondou <kondou@ts.unde.re>
Date: Fri, 2 Aug 2013 11:39:48 +0000 (+0200)
Subject: Merge branch 'master' into add_ocimage_unittest
X-Git-Tag: v6.0.0alpha2~363^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=12ee590b2ccf33afa03ddda02d05f36273c1cdf3;p=nextcloud-server.git

Merge branch 'master' into add_ocimage_unittest
---

12ee590b2ccf33afa03ddda02d05f36273c1cdf3