From: tobiasKaminsky <tobias@kaminsky.me>
Date: Wed, 12 Nov 2014 08:02:23 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/develop' into beautifyTimestamps
X-Git-Tag: oc-android-1.7.0_signed~108^2~2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/79cb6106fd3fc83aa84d18fb472788833b980ea8?ds=inline;hp=79cb6106fd3fc83aa84d18fb472788833b980ea8

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

Conflicts:
	src/com/owncloud/android/utils/DisplayUtils.java
---