]> gitweb.fluxo.info Git - keyringer.git/commitdiff
Merge branch 'master' into develop
authorSilvio Rhatto <rhatto@riseup.net>
Fri, 16 May 2014 19:50:42 +0000 (16:50 -0300)
committerSilvio Rhatto <rhatto@riseup.net>
Fri, 16 May 2014 19:50:42 +0000 (16:50 -0300)

Trivial merge