]> gitweb.fluxo.info Git - puppet-backupninja.git/commitdiff
Merge remote branch 'anarcat/master'
authorMicah Anderson <micah@riseup.net>
Wed, 9 Dec 2009 04:46:05 +0000 (23:46 -0500)
committerMicah Anderson <micah@riseup.net>
Wed, 9 Dec 2009 04:46:05 +0000 (23:46 -0500)
1  2 
README

diff --cc README
Simple merge