From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 24 Mar 2011 18:21:25 +0000 (-0300)
Subject: Merge branches 'mayfirst' and 'master'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=46baf4a692932482cac32eff91d49de461411bac;p=puppet-common.git

Merge branches 'mayfirst' and 'master'
---