From: David A. Velasco <dvelasco@solidgear.es>
Date: Fri, 12 Apr 2013 10:34:17 +0000 (+0200)
Subject: Merge branch 'bug_hunting' into develop
X-Git-Tag: oc-android-1.4.3~40
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/8aeb5243b70ad931aaef7b88b5f52f054cd4171b?hp=8aeb5243b70ad931aaef7b88b5f52f054cd4171b

Merge branch 'bug_hunting' into develop

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