Merge branch 'develop' into fixForCrashedSharedContents
authorDavid A. Velasco <dvelasco@solidgear.es>
Fri, 3 May 2013 12:25:02 +0000 (14:25 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Fri, 3 May 2013 12:25:02 +0000 (14:25 +0200)
commit65f403bf994bd84d64eea16072b7bec479c0d525
tree8c0c5f2cadf95ca854bd89db41301f8e1ebd23d1
parente0ce2d4d5c6eea8bf7801e8f1e3960943bc54017
parent52bd01bcedf1b8f13c49b67ee40a848bae1a9d40
Merge branch 'develop' into fixForCrashedSharedContents

Conflicts:
src/com/owncloud/android/Uploader.java
src/com/owncloud/android/Uploader.java