From: Silvio Rhatto <rhatto@riseup.net>
Date: Fri, 17 Jul 2015 11:18:53 +0000 (-0300)
Subject: Merge branch 'master' into develop
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=2621e23b5bcfef8c9c5f23cd670c22ce3c112aa3;p=puppet-nodo.git

Merge branch 'master' into develop
---

2621e23b5bcfef8c9c5f23cd670c22ce3c112aa3