From: tobiasKaminsky <tobias@kaminsky.me>
Date: Wed, 5 Nov 2014 20:45:08 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/develop' into rotateImage
X-Git-Tag: oc-android-1.7.0_signed~81^2~5
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/c105861d0fa27912a19a85f39fed7950de5a3d9a?hp=c105861d0fa27912a19a85f39fed7950de5a3d9a

Merge remote-tracking branch 'upstream/develop' into rotateImage

Conflicts:
	src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
---