From: David A. Velasco <dvelasco@solidgear.es>
Date: Mon, 15 Sep 2014 07:41:25 +0000 (+0200)
Subject: Merge branch 'develop' of https://github.com/tobiasKaminsky/android into thumbnails_f... 
X-Git-Tag: oc-android-1.7.0_signed~163^2~8
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/aae90eb1aa42a11449e30330e3e23e1e9e5eebb6?hp=aae90eb1aa42a11449e30330e3e23e1e9e5eebb6

Merge branch 'develop' of https://github.com/tobiasKaminsky/android into thumbnails_for_downloaded_images
---