From: David A. Velasco <dvelasco@solidgear.es>
Date: Thu, 4 Apr 2013 14:49:04 +0000 (+0200)
Subject: Merge branch 'bug_hunting' into feature_previews
X-Git-Tag: oc-android-1.4.3~39^2~5
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/053aad5ae17a1ad7a15218c220810e6b369fea4c?ds=sidebyside;hp=053aad5ae17a1ad7a15218c220810e6b369fea4c

Merge branch 'bug_hunting' into feature_previews

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