From: masensio <masensio@solidgear.es>
Date: Mon, 23 Sep 2013 07:06:37 +0000 (+0200)
Subject: Merge branch 'develop' into fix_loading_dialog_crash
X-Git-Tag: oc-android-1.4.6~11^2~2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/0c4adf5134ef12dff149c6e7bf03be4c7e15b8db?ds=inline;hp=--cc

Merge branch 'develop' into fix_loading_dialog_crash
---

0c4adf5134ef12dff149c6e7bf03be4c7e15b8db