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

Merge branch 'develop' into thumbnailOOM
---

ddbb5d25223c28a2cdd68dee6799a7d9937887bb