From: masensio <masensio@solidgear.es>
Date: Thu, 19 Feb 2015 12:02:53 +0000 (+0100)
Subject: Merge branch 'develop' into enable_cookies
X-Git-Tag: oc-android-1.7.1_signed^2~42^2~1
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/0a03b6d3d46b20773e5c2b0548557ae4dd3cc260?ds=inline;hp=0a03b6d3d46b20773e5c2b0548557ae4dd3cc260

Merge branch 'develop' into enable_cookies

Conflicts:
	src/com/owncloud/android/authentication/AuthenticatorActivity.java
---