From: Silvio Rhatto Date: Tue, 25 Aug 2015 22:15:37 +0000 (-0300) Subject: Merge branch 'master' into develop X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=eab48bc8d50da549cd4be07d7ede5b25cd876c42;p=puppet-nodo.git Merge branch 'master' into develop --- eab48bc8d50da549cd4be07d7ede5b25cd876c42