From: masensio <masensio@solidgear.es>
Date: Wed, 26 Mar 2014 11:44:55 +0000 (+0100)
Subject: Merge branch 'master' into develop
X-Git-Tag: oc-android-1.7.0_signed~361
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/c9a68d67e93a7cb6db59f604450041849f4b3c73?ds=inline

Merge branch 'master' into develop
---

c9a68d67e93a7cb6db59f604450041849f4b3c73