]> gitweb.fluxo.info Git - keyringer.git/commitdiff
Merge branch 'release/0.3.6' into develop
authorSilvio Rhatto <rhatto@riseup.net>
Tue, 20 May 2014 15:31:37 +0000 (12:31 -0300)
committerSilvio Rhatto <rhatto@riseup.net>
Tue, 20 May 2014 15:31:37 +0000 (12:31 -0300)

Trivial merge