From: Silvio Rhatto <rhatto@riseup.net>
Date: Wed, 31 May 2017 22:20:50 +0000 (-0300)
Subject: Merge branch 'develop'
X-Git-Tag: 0.5.9~16
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=374887922e7018e6b0c8e3d2ba8f52d4386ec682;p=keyringer.git

Merge branch 'develop'
---

374887922e7018e6b0c8e3d2ba8f52d4386ec682