Merge remote-tracking branch 'upstream/develop' into beautifyTimestamps
authortobiasKaminsky <tobias@kaminsky.me>
Wed, 12 Nov 2014 08:02:23 +0000 (09:02 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Wed, 12 Nov 2014 08:02:23 +0000 (09:02 +0100)
commit79cb6106fd3fc83aa84d18fb472788833b980ea8
treee5371af6a8fe871b32a20c55414207e262984038
parent2117c024c4284c07fdb0a0a5673d0dd866eef5a0
parent1efefbd22c21263f25034935e763672a378440ce
Merge remote-tracking branch 'upstream/develop' into beautifyTimestamps

Conflicts:
src/com/owncloud/android/utils/DisplayUtils.java
res/values/strings.xml
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
src/com/owncloud/android/utils/DisplayUtils.java