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

Merge branch 'develop'
---

232c85ea9323771b09cad4b2363498f7534989fe