Merge remote-tracking branch 'origin/enable_cookies' into enable_cookies
authormasensio <masensio@solidgear.es>
Fri, 13 Feb 2015 13:39:35 +0000 (14:39 +0100)
committermasensio <masensio@solidgear.es>
Fri, 13 Feb 2015 13:39:35 +0000 (14:39 +0100)
commitfba65e37f68f5cd72fb20c96982607702193a509
treea1d6e2057421ab8d8af6fb0cbb7f58289f9e2a32
parent75880ec5531ebefd9c57748f03d11831c233b308
parenta5fca19b0fc9fcdab9dc65e5ab14084c55f9e2eb
Merge remote-tracking branch 'origin/enable_cookies' into enable_cookies

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