From: David A. Velasco <dvelasco@solidgear.es>
Date: Thu, 11 Oct 2012 09:40:15 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into cancel_in_upload
X-Git-Tag: oc-android-1.4.3~155
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/b0ab3ce0872d2702e82b5979dddaa5a897be340b?hp=b0ab3ce0872d2702e82b5979dddaa5a897be340b

Merge remote-tracking branch 'origin/master' into cancel_in_upload

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