From: masensio <masensio@solidgear.es>
Date: Fri, 30 May 2014 06:35:19 +0000 (+0200)
Subject: Merge branch 'develop' into pull_down_refresh
X-Git-Tag: oc-android-1.7.0_signed~292^2~6
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/aa9c09372de4a7358d14977dfb3582d2e0cea364?hp=--cc

Merge branch 'develop' into pull_down_refresh
---

aa9c09372de4a7358d14977dfb3582d2e0cea364