]> gitweb.fluxo.info Git - puppet-tor.git/commitdiff
Merge remote-tracking branch 'riseup/master'
authorintrigeri <intrigeri@boum.org>
Wed, 14 Mar 2012 19:36:22 +0000 (20:36 +0100)
committerintrigeri <intrigeri@boum.org>
Wed, 14 Mar 2012 19:36:22 +0000 (20:36 +0100)
1  2 
manifests/init.pp

Simple merge