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

Trivial merge