From: masensio <masensio@solidgear.es>
Date: Tue, 1 Oct 2013 10:58:17 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/develop' into refresh_folder_contents_when_brows... 
X-Git-Tag: oc-android-1.5.5~155^2~32
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/5ff0989eb47fbc9d5211cc294f17cf692f7eff50?ds=inline;hp=5ff0989eb47fbc9d5211cc294f17cf692f7eff50

Merge remote-tracking branch 'origin/develop' into refresh_folder_contents_when_browsed_into
---