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

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

105b183d7d31b9bf922d081ff1087ab4cdf0c0b2