From: drebs <drebs@riseup.net>
Date: Wed, 11 Jan 2012 20:04:43 +0000 (-0200)
Subject: Merge branch 'master' of ssh://git.sarava.org/puppet-tor
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=bc04fae1870269c59483c3ca15f5defd2aabbecb;p=puppet-tor.git

Merge branch 'master' of ssh://git.sarava.org/puppet-tor
---

bc04fae1870269c59483c3ca15f5defd2aabbecb