From: David A. Velasco <dvelasco@solidgear.es>
Date: Mon, 6 May 2013 08:48:43 +0000 (+0200)
Subject: Merge branch 'develop' into file_browsing_refactoring
X-Git-Tag: oc-android-1.4.3~27^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/b36914df88ff9abd04c19b422889de894df3a714?hp=b36914df88ff9abd04c19b422889de894df3a714

Merge branch 'develop' into file_browsing_refactoring

Conflicts:
	AndroidManifest.xml
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
	src/com/owncloud/android/ui/fragment/FileDetailFragment.java
---