]> gitweb.fluxo.info Git - puppet-backupninja.git/commitdiff
Merge remote branch 'anarcat/master'
authorMicah Anderson <micah@riseup.net>
Mon, 7 Dec 2009 21:17:04 +0000 (16:17 -0500)
committerMicah Anderson <micah@riseup.net>
Mon, 7 Dec 2009 21:17:04 +0000 (16:17 -0500)

Trivial merge