From: Silvio Rhatto Date: Fri, 11 Sep 2015 23:22:34 +0000 (-0300) Subject: Merge branch 'master' into develop X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=155c43c53ef8cb71e2b9567aa58ec1666a754b4a;p=puppet-nodo.git Merge branch 'master' into develop --- 155c43c53ef8cb71e2b9567aa58ec1666a754b4a