From: jabarros <jabarros@solidgear.es>
Date: Wed, 3 Dec 2014 08:33:07 +0000 (+0100)
Subject: Merge branch 'release-1.6.2'
X-Git-Tag: oc-android-1.7.0_signed~15^2~5
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/bad9f3011590d2f6b634833e3ef9e78a8fa0a96e?ds=inline;hp=-c

Merge branch 'release-1.6.2'
---

bad9f3011590d2f6b634833e3ef9e78a8fa0a96e