]> gitweb.fluxo.info Git - puppet-nodo.git/commitdiff
Merge branch 'master' into develop
authorSilvio Rhatto <rhatto@riseup.net>
Fri, 17 Jul 2015 11:18:53 +0000 (08:18 -0300)
committerSilvio Rhatto <rhatto@riseup.net>
Fri, 17 Jul 2015 11:18:53 +0000 (08:18 -0300)

Trivial merge