From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 12 Sep 2013 22:51:10 +0000 (-0300)
Subject: Merge branch 'master' into debian
X-Git-Tag: 0.2.3~29
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=95349dc8761e4f529f09fbfe84b6941cae7381db;p=keyringer.git

Merge branch 'master' into debian
---

95349dc8761e4f529f09fbfe84b6941cae7381db