From: Silvio Rhatto <rhatto@riseup.net>
Date: Fri, 6 Sep 2013 02:24:05 +0000 (-0300)
Subject: Merge branch 'master' into debian
X-Git-Tag: 0.2.3~33
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=5811e07b6caca8023d823b8e7cf3eedc1dc1f8d9;p=keyringer.git

Merge branch 'master' into debian
---

5811e07b6caca8023d823b8e7cf3eedc1dc1f8d9