From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 17 Nov 2016 13:33:29 +0000 (-0200)
Subject: Merge branch 'develop'
X-Git-Tag: 0.5.9~18
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=e8b1c968d9f1ddd2b10b7a6e584b0f1329debea9;p=keyringer.git

Merge branch 'develop'
---

e8b1c968d9f1ddd2b10b7a6e584b0f1329debea9