]> gitweb.fluxo.info Git - puppet-tor.git/commitdiff
Merge remote-tracking branch 'riseup/master' into shared-master
authorintrigeri <intrigeri@boum.org>
Sat, 4 Aug 2012 14:29:37 +0000 (16:29 +0200)
committerintrigeri <intrigeri@boum.org>
Sat, 4 Aug 2012 14:29:37 +0000 (16:29 +0200)
1  2 
manifests/daemon.pp

Simple merge