]> gitweb.fluxo.info Git - keyringer.git/commitdiff
Merge branch 'master' into debian
authorSilvio Rhatto <rhatto@riseup.net>
Fri, 6 Sep 2013 02:24:05 +0000 (23:24 -0300)
committerSilvio Rhatto <rhatto@riseup.net>
Fri, 6 Sep 2013 02:24:05 +0000 (23:24 -0300)

Trivial merge