From: tobiasKaminsky <tobias@kaminsky.me>
Date: Sat, 29 Nov 2014 11:18:02 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/develop' into triggerMediaScan
X-Git-Tag: oc-android-1.7.0_signed~90^2~9
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/eaa3b1ef566ec3301dc648e6e57b39af7915392f?ds=inline;hp=eaa3b1ef566ec3301dc648e6e57b39af7915392f

Merge remote-tracking branch 'upstream/develop' into triggerMediaScan
-fr/strings.xml

Conflicts:
	src/com/owncloud/android/datamodel/FileDataStorageManager.java
	src/com/owncloud/android/datamodel/OCFile.java
---