From: Silvio Rhatto <rhatto@riseup.net>
Date: Tue, 20 May 2014 15:04:12 +0000 (-0300)
Subject: Merge branch 'release/0.3.5' into develop
X-Git-Tag: 0.3.6^2~2
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=b6880c29861e1ed826d40d589ba96b4ce46735d3;p=keyringer.git

Merge branch 'release/0.3.5' into develop
---

b6880c29861e1ed826d40d589ba96b4ce46735d3