]> gitweb.fluxo.info Git - puppet-nodo.git/commitdiff
Merge branch 'master' into develop
authorSilvio Rhatto <rhatto@riseup.net>
Fri, 11 Sep 2015 23:22:34 +0000 (20:22 -0300)
committerSilvio Rhatto <rhatto@riseup.net>
Fri, 11 Sep 2015 23:22:34 +0000 (20:22 -0300)

Trivial merge