From: Silvio Rhatto Date: Mon, 20 Jul 2015 22:45:20 +0000 (-0300) Subject: Merge branch 'master' into develop X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=e7be3eca0600b1541d449ba915a8b7f56d1a989b;p=puppet-nodo.git Merge branch 'master' into develop --- e7be3eca0600b1541d449ba915a8b7f56d1a989b