Merge branch 'develop' into enable_cookies
authormasensio <masensio@solidgear.es>
Thu, 19 Feb 2015 12:02:53 +0000 (13:02 +0100)
committermasensio <masensio@solidgear.es>
Thu, 19 Feb 2015 12:02:53 +0000 (13:02 +0100)
commit0a03b6d3d46b20773e5c2b0548557ae4dd3cc260
tree87c973fb93d6b79d5100d1fa6272da8073f09c25
parent90b786853ef6150be22af40afd0562f0ca6639ce
parentec6b9d7c70deb50152bfab5cb5f25c9a2dde28e7
Merge branch 'develop' into enable_cookies

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