From: Silvio Rhatto <rhatto@riseup.net>
Date: Fri, 3 Nov 2017 12:55:26 +0000 (-0200)
Subject: Merge branch 'develop'
X-Git-Tag: 0.5.9~15
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=b6dec4f1efe948f01df02b364cbb7f7aeedaa2b1;p=keyringer.git

Merge branch 'develop'
---

b6dec4f1efe948f01df02b364cbb7f7aeedaa2b1