From: Silvio Rhatto <rhatto@riseup.net>
Date: Wed, 30 May 2018 17:45:12 +0000 (-0300)
Subject: Merge branch 'develop'
X-Git-Tag: 0.5.9~14
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=e5659e2ba6be675f2f8383e0264bde8968a869d0;p=keyringer.git

Merge branch 'develop'
---

e5659e2ba6be675f2f8383e0264bde8968a869d0