From: intrigeri <intrigeri@boum.org>
Date: Wed, 14 Mar 2012 19:36:22 +0000 (+0100)
Subject: Merge remote-tracking branch 'riseup/master'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=7bf57976706f73881d18bbaea0e7f87b7f1c3b40;p=puppet-tor.git

Merge remote-tracking branch 'riseup/master'
---

7bf57976706f73881d18bbaea0e7f87b7f1c3b40