From: Micah Anderson <micah@riseup.net>
Date: Thu, 2 Sep 2010 23:12:58 +0000 (-0400)
Subject: Merge remote branch 'immerda/master'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=a5e4ab40d8e5074c3ef6525358858376c5dbdab7;p=puppet-apt.git

Merge remote branch 'immerda/master'

Conflicts:
	manifests/init.pp
---

a5e4ab40d8e5074c3ef6525358858376c5dbdab7