From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 14 Jul 2011 13:46:32 +0000 (-0300)
Subject: Merge branches 'mayfirst' and 'master'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=d1ac2230815da2912d9b77575d1bf073875fa493;p=puppet-monkeysphere.git

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