From: masensio <masensio@solidgear.es>
Date: Tue, 18 Feb 2014 09:32:28 +0000 (+0100)
Subject: Merge branch 'develop' into send_file_pr311_with_develop
X-Git-Tag: oc-android-1.5.5~22^2~22
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/c6d4f4980b1099764f8dc169abe881f7191fca6b?ds=inline

Merge branch 'develop' into send_file_pr311_with_develop
---

c6d4f4980b1099764f8dc169abe881f7191fca6b