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

Merge branch 'master' into debian
---

3f6c8000abbb45788f76a9b5bc36344d340763c3