Merge branch 'develop' into upgrading_account_manager
authorDavid A. Velasco <dvelasco@solidgear.es>
Wed, 15 Apr 2015 10:16:24 +0000 (12:16 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Wed, 15 Apr 2015 10:16:24 +0000 (12:16 +0200)
1  2 
owncloud-android-library

diff --combined owncloud-android-library
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 21c329aa126833119f4bc6ed06a3f3881964246f
 -Subproject commit 9e761387a0b406402684571f28c36c2d6d2b6301
++Subproject commit 2e993f9893739ca4bf0883b881b125030a9cad26