]> gitweb.fluxo.info Git - puppet-nodo.git/commitdiff
Merge branch 'master' into develop
authorSilvio Rhatto <rhatto@riseup.net>
Sun, 12 Jul 2015 18:28:40 +0000 (15:28 -0300)
committerSilvio Rhatto <rhatto@riseup.net>
Sun, 12 Jul 2015 18:28:40 +0000 (15:28 -0300)

Trivial merge