From: jabarros <jabarros@solidgear.es>
Date: Mon, 20 Oct 2014 12:54:46 +0000 (+0200)
Subject: Merge branch 'master' into develop
X-Git-Tag: oc-android-1.7.0_signed~140
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/3a8ff76d0a68d0ba18513c177b69bb8cb38e4189?ds=sidebyside;hp=3a8ff76d0a68d0ba18513c177b69bb8cb38e4189

Merge branch 'master' into develop

Conflicts:
	owncloud-android-library
---