From: David A. Velasco <dvelasco@solidgear.es>
Date: Wed, 30 Jan 2013 12:49:36 +0000 (+0100)
Subject: Merge branch 'file_icons' into workaround_integration
X-Git-Tag: oc-android-1.4.3~61
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/37f0586c47ab5c2b8f47a4b286b5c0df06b27c12?ds=sidebyside

Merge branch 'file_icons' into workaround_integration
---

37f0586c47ab5c2b8f47a4b286b5c0df06b27c12