From: jabarros <jabarros@solidgear.es>
Date: Mon, 6 Oct 2014 12:58:34 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/loripino21/android into instant_upload_pa... 
X-Git-Tag: oc-android-1.7.0_signed~141^2~7
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/1e7e893321e3939bf773349d41efc18caad7ab99?hp=--cc

Merge branch 'master' of https://github.com/loripino21/android into instant_upload_path_chooseable
---

1e7e893321e3939bf773349d41efc18caad7ab99