]> gitweb.fluxo.info Git - puppet-nodo.git/commitdiff
Merge branch 'master' into develop
authorSilvio Rhatto <rhatto@riseup.net>
Thu, 27 Aug 2015 02:41:54 +0000 (23:41 -0300)
committerSilvio Rhatto <rhatto@riseup.net>
Thu, 27 Aug 2015 02:41:54 +0000 (23:41 -0300)

Trivial merge