From: masensio <masensio@solidgear.es>
Date: Tue, 27 May 2014 11:18:41 +0000 (+0200)
Subject: Merge branch 'develop' into release-1.5.6
X-Git-Tag: oc-android-1.7.0_signed~295^2~9
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/a3a5cd4eb7e020d7a197dc266cc9d18f738266ad?hp=a3a5cd4eb7e020d7a197dc266cc9d18f738266ad

Merge branch 'develop' into release-1.5.6
---