From: tobiasKaminsky <tobias@kaminsky.me>
Date: Sat, 9 Aug 2014 08:20:07 +0000 (+0200)
Subject: Merge branch 'develop' of https://github.com/tobiasKaminsky/android into develop
X-Git-Tag: oc-android-1.7.0_signed~163^2~8^2~5
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/8c96447fe75afb512621a6c6bb134aa6852e9162?ds=inline;hp=8c96447fe75afb512621a6c6bb134aa6852e9162

Merge branch 'develop' of https://github.com/tobiasKaminsky/android into develop

Conflicts:
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
---