]> gitweb.fluxo.info Git - keyringer.git/commitdiff
Merge branch 'master' into debian
authorSilvio Rhatto <rhatto@riseup.net>
Thu, 12 Sep 2013 22:10:32 +0000 (19:10 -0300)
committerSilvio Rhatto <rhatto@riseup.net>
Thu, 12 Sep 2013 22:10:32 +0000 (19:10 -0300)

Trivial merge