From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 7 Jul 2011 15:22:32 +0000 (-0300)
Subject: Merge branch 'master', remote branch 'origin'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=2e75a13452fa3ff415fbb553bf59e3e14a7a9126;p=puppet-ekeyd.git

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