]> gitweb.fluxo.info Git - puppet-nodo.git/commitdiff
Merge branch 'master' into develop
authorSilvio Rhatto <rhatto@riseup.net>
Tue, 21 Jul 2015 13:19:56 +0000 (10:19 -0300)
committerSilvio Rhatto <rhatto@riseup.net>
Tue, 21 Jul 2015 13:19:56 +0000 (10:19 -0300)

Trivial merge