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

Merge branch 'release/0.3.6'
---

e61a77485989f9237fbf410df7daf5ed7f1b880b