From: Silvio Rhatto <rhatto@riseup.net>
Date: Tue, 21 Jul 2015 13:19:56 +0000 (-0300)
Subject: Merge branch 'master' into develop
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=08e69eee2597183cc21cfe1fd701bddbb52257b5;p=puppet-nodo.git

Merge branch 'master' into develop
---

08e69eee2597183cc21cfe1fd701bddbb52257b5