]> gitweb.fluxo.info Git - puppet-apt.git/commit
Merge remote branch 'riseup/master'
authorGabriel Filion <lelutin@gmail.com>
Mon, 18 Oct 2010 00:35:35 +0000 (20:35 -0400)
committerGabriel Filion <lelutin@gmail.com>
Mon, 18 Oct 2010 00:35:35 +0000 (20:35 -0400)
commit296593bcbd7d5cc329737830bb938f93abf3fa3d
tree70b00c8221b111767723952fd382c63257de4920
parent521ccfec19d40fa5d78162727afa26c15778c173
parent356ff9334078198fde39fe5c8e8212109d6537a0
Merge remote branch 'riseup/master'

Conflicts:
manifests/init.pp
manifests/init.pp