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)
commit4457dbd3177fb6084f801187c35e09008bcd3b50
tree4861f35d3b37cce8767dffb16487976b8dfec3e3
parent1c579d1eb07dc6617f086d09922d201d2a39420e
parent15512f8d633551c3f53d4271677daec76a433c66
Merge branch 'develop' into upgrading_account_manager
owncloud-android-library