Merge branch 'develop' into pincode_request_is_not_starting_when_rotating
authorpurigarcia <pgarcia@solidgear.es>
Fri, 10 Jul 2015 06:53:03 +0000 (08:53 +0200)
committerpurigarcia <pgarcia@solidgear.es>
Fri, 10 Jul 2015 06:53:03 +0000 (08:53 +0200)

Trivial merge