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)
commit537e075fca51a81570d7de702ced3eea4838da51
treed802810b92807650d93e84cedd9084767e8aca33
parent00482b6dcb1e98da39df54374f7098b51d66bee5
parente935e9239d7c30b9ae79d1a7abb24a17830368ab
Merge branch 'develop'

Conflicts FIXED:
owncloud-android-library
owncloud-android-library