Merge remote branch 'immerda/master' into immerda
authorMicah Anderson <micah@riseup.net>
Tue, 14 Dec 2010 20:08:07 +0000 (15:08 -0500)
committerMicah Anderson <micah@riseup.net>
Tue, 14 Dec 2010 20:08:07 +0000 (15:08 -0500)
commit651c21bec8984f0c6b2f37c72d5b4169f050b29e
treee176f44ad90560fc2462aeebbb363dba9b7ad9f5
parent3045f4696905b07fd74018171934f8b3430590e2
parent2a4115c5a6dd2eeb2e93eaafa70c878bc797d3db
Merge remote branch 'immerda/master' into immerda

Conflicts:
manifests/puppetmaster/checklastrun.pp
manifests/puppetmaster/checklastrun/disable.pp
manifests/puppetmaster/checklastrun.pp
manifests/puppetmaster/checklastrun/disable.pp