Merge branch 'develop' into check_server_certificates_in_SSO_webview
authormasensio <masensio@solidgear.es>
Tue, 11 Mar 2014 09:54:10 +0000 (10:54 +0100)
committermasensio <masensio@solidgear.es>
Tue, 11 Mar 2014 09:54:10 +0000 (10:54 +0100)
1  2 
owncloud-android-library

@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit e8a6c642a0f5e0d1a878164f893344d7c6b61c6d
 -Subproject commit 1dbc9a121e8818d0202d3aaec31bce1335ee428b
++Subproject commit 268681dbffbd15b820fd0a29211c62c88135203d