]> gitweb.fluxo.info Git - keyringer.git/commitdiff
Merge branch 'develop'
authorSilvio Rhatto <rhatto@riseup.net>
Thu, 18 Jun 2015 19:33:51 +0000 (16:33 -0300)
committerSilvio Rhatto <rhatto@riseup.net>
Thu, 18 Jun 2015 19:33:51 +0000 (16:33 -0300)

Trivial merge