From: tobiasKaminsky <tobias@kaminsky.me>
Date: Wed, 22 Oct 2014 06:09:47 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/develop' into triggerMediaScan
X-Git-Tag: oc-android-1.7.0_signed~90^2~25
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/d7b32ecc1754cc06023de2e6f2bbbf3555514d74?hp=d7b32ecc1754cc06023de2e6f2bbbf3555514d74

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

Conflicts:
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
	src/com/owncloud/android/ui/preview/PreviewImageActivity.java
	src/com/owncloud/android/ui/preview/PreviewImageFragment.java
---