From: masensio <masensio@solidgear.es>
Date: Fri, 30 May 2014 12:16:33 +0000 (+0200)
Subject: Merge branch 'develop' into pull_down_refresh
X-Git-Tag: oc-android-1.7.0_signed~292^2~4
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/ca555b2cd87b8728c61dce808ccec1215e4caf2b

Merge branch 'develop' into pull_down_refresh
---

ca555b2cd87b8728c61dce808ccec1215e4caf2b