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

Merge branch 'feature_previews' into develop

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