From: masensio <masensio@solidgear.es>
Date: Tue, 5 May 2015 08:31:46 +0000 (+0200)
Subject: Merge branch 'develop' into thumbnailOOM
X-Git-Tag: test~6^2^2~8
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/7eea2ea507b41edb242cc1a2fe9eae1a9c03d280?ds=inline;hp=--cc

Merge branch 'develop' into thumbnailOOM
---

7eea2ea507b41edb242cc1a2fe9eae1a9c03d280