]> gitweb.fluxo.info Git - puppet-nodo.git/commitdiff
Merge branch 'master' into develop
authorSilvio Rhatto <rhatto@riseup.net>
Fri, 31 Jul 2015 19:07:29 +0000 (16:07 -0300)
committerSilvio Rhatto <rhatto@riseup.net>
Fri, 31 Jul 2015 19:07:29 +0000 (16:07 -0300)

Trivial merge