From: masensio <masensio@solidgear.es>
Date: Mon, 7 Apr 2014 06:58:42 +0000 (+0200)
Subject: Merge branch 'develop' into save_position_in_scroll_when_browsing
X-Git-Tag: oc-android-1.7.0_signed~337^2~7
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/14a466edebae51f1e83a0393d4e4248163c4b3cf

Merge branch 'develop' into save_position_in_scroll_when_browsing
---

14a466edebae51f1e83a0393d4e4248163c4b3cf