From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 18 Jun 2015 19:33:51 +0000 (-0300)
Subject: Merge branch 'develop'
X-Git-Tag: 0.5.9~20
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=29d1d44e723441d76cd5a426b94c9e0d0feef01b;p=keyringer.git

Merge branch 'develop'
---

29d1d44e723441d76cd5a426b94c9e0d0feef01b