]> gitweb.fluxo.info Git - puppet-nodo.git/commitdiff
Merge branch 'master' into develop
authorSilvio Rhatto <rhatto@riseup.net>
Tue, 25 Aug 2015 22:32:35 +0000 (19:32 -0300)
committerSilvio Rhatto <rhatto@riseup.net>
Tue, 25 Aug 2015 22:32:35 +0000 (19:32 -0300)

Trivial merge