From: masensio Date: Wed, 6 May 2015 11:42:43 +0000 (+0200) Subject: Merge branch 'develop' into thumbnailOOM X-Git-Tag: test~6^2^2~6 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/6f3e8fbb85da750a4e01993affa68e5a3d2e1056?ds=sidebyside;hp=--cc Merge branch 'develop' into thumbnailOOM --- 6f3e8fbb85da750a4e01993affa68e5a3d2e1056