]> gitweb.fluxo.info Git - keyringer.git/commit
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)
commit2d5facf273018bdef3fe442a64346b24cff631dc
tree2e9c31a81657ea531ef99433a09a6534959f18d1
parentb19b9318d0fe0de9444dda6856a17384b8b9450d
parent30328dcdebd1bdca9385b8f4e17ace0c0500efdc
Merge branch 'master' into develop