From: jabarros <jabarros@solidgear.es>
Date: Fri, 24 Oct 2014 11:38:03 +0000 (+0200)
Subject: Merge branch 'thumbnails_from_server' of https://github.com/tobiasKaminsky/android... 
X-Git-Tag: oc-android-1.7.0_signed~121^2~7
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/2e47071c9c44d687b0c69a393807ea32fde08184?hp=2e47071c9c44d687b0c69a393807ea32fde08184

Merge branch 'thumbnails_from_server' of https://github.com/tobiasKaminsky/android into thumbnails_from_server

Conflicts:
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
---