From: Silvio Rhatto <rhatto@riseup.net>
Date: Wed, 13 Jul 2011 20:53:01 +0000 (-0300)
Subject: Merge branch 'master', remote branch 'origin'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=b0c0b29cf37451cfe7090e2f53197798c5dbba4b;p=puppet-loginrecords.git

Merge branch 'master', remote branch 'origin'
---