From: David A. Velasco <dvelasco@solidgear.es>
Date: Fri, 7 Aug 2015 08:17:03 +0000 (+0200)
Subject: Merge branch 'develop'
X-Git-Tag: oc-android-1.8~27^2~6
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/537e075fca51a81570d7de702ced3eea4838da51?ds=sidebyside;hp=537e075fca51a81570d7de702ced3eea4838da51

Merge branch 'develop'

Conflicts FIXED:
	owncloud-android-library
---