Merge remote-tracking branch 'origin/master' into cancel_in_upload
authorDavid A. Velasco <dvelasco@solidgear.es>
Thu, 11 Oct 2012 09:40:15 +0000 (11:40 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Thu, 11 Oct 2012 09:40:15 +0000 (11:40 +0200)
commitb0ab3ce0872d2702e82b5979dddaa5a897be340b
treeb75b0bb28b506a3b2de98601233ec3e255c6e824
parent5fc7cd13e7e561ef528e12d2fa088b58e35e00d0
parent7fead3cb22a70f8b2bb23a7e981c5ee3708dd523
Merge remote-tracking branch 'origin/master' into cancel_in_upload

Conflicts:
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java