Merge branch 'develop'
authorDavid A. Velasco <dvelasco@solidgear.es>
Fri, 7 Aug 2015 08:17:03 +0000 (10:17 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Fri, 7 Aug 2015 08:17:03 +0000 (10:17 +0200)
Conflicts FIXED:
owncloud-android-library


No differences found