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