From: David A. Velasco <dvelasco@solidgear.es>
Date: Wed, 23 Oct 2013 15:35:07 +0000 (+0200)
Subject: Merge branch 'develop' into refresh_folder_contents_when_browsed_into
X-Git-Tag: oc-android-1.5.5~155^2~4
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/db87c22150ad8a0697ad5191f379647ca1c8ca50?hp=db87c22150ad8a0697ad5191f379647ca1c8ca50

Merge branch 'develop' into refresh_folder_contents_when_browsed_into
---