From: masensio <masensio@solidgear.es>
Date: Mon, 10 Feb 2014 09:19:02 +0000 (+0100)
Subject: Merge branch 'develop' into release-1.5.4
X-Git-Tag: oc-android-1.5.5~35^2~10
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/47c90583eaa4afe92eb0526577c026101b97658a?ds=inline;hp=--cc

Merge branch 'develop' into release-1.5.4
---

47c90583eaa4afe92eb0526577c026101b97658a