From: purigarcia <pgarcia@solidgear.es>
Date: Fri, 10 Jul 2015 06:53:03 +0000 (+0200)
Subject: Merge branch 'develop' into pincode_request_is_not_starting_when_rotating
X-Git-Tag: oc-android-1.8~63^2~1
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/66fd64a0fcebb1f6ee6cecf579025836733c3cfc?ds=inline;hp=-c

Merge branch 'develop' into pincode_request_is_not_starting_when_rotating
---

66fd64a0fcebb1f6ee6cecf579025836733c3cfc