]> gitweb.fluxo.info Git - puppet-tor.git/commitdiff
projects / puppet-tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a777b3b 110f443)
Merge branch 'master' of ssh://git.sarava.org/puppet-tor
authordrebs <drebs@riseup.net>
Wed, 11 Jan 2012 20:04:43 +0000 (18:04 -0200)
committerdrebs <drebs@riseup.net>
Wed, 11 Jan 2012 20:04:43 +0000 (18:04 -0200)
1  2 
manifests/daemon.pp patch | diff1 | diff2 | blob | history

diff --cc manifests/daemon.pp
Simple merge
Puppet module for tor