From: masensio <masensio@solidgear.es>
Date: Fri, 14 Feb 2014 09:59:26 +0000 (+0100)
Subject: Merge branch 'pr/311' into pull_request_311_with_develop
X-Git-Tag: oc-android-1.5.5~22^2~30
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/296df1bb6550081535ff06dfacd1d28345c51545?ds=inline

Merge branch 'pr/311' into pull_request_311_with_develop
---

296df1bb6550081535ff06dfacd1d28345c51545