Merge remote-tracking branch 'upstream/develop' into rotateImage
authortobiasKaminsky <tobias@kaminsky.me>
Wed, 5 Nov 2014 20:45:08 +0000 (21:45 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Wed, 5 Nov 2014 20:45:08 +0000 (21:45 +0100)
commitc105861d0fa27912a19a85f39fed7950de5a3d9a
treee496be25a10487acab74eb272d160b5362d9244a
parent3b3d3e05bc9c9a8e261c8e2b60fe4e879b20035d
parent80cfc55fda1f71124e2a658b46229cbb7c1feb77
Merge remote-tracking branch 'upstream/develop' into rotateImage

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