From: Silvio Rhatto <rhatto@riseup.net>
Date: Wed, 21 Dec 2016 12:19:25 +0000 (-0200)
Subject: Merge branch 'develop'
X-Git-Tag: 0.5.9~17
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=e597eb9acfab30157abefe6317387f6297d3e869;p=keyringer.git

Merge branch 'develop'
---

e597eb9acfab30157abefe6317387f6297d3e869