From: mh <mh@immerda.ch>
Date: Fri, 18 Apr 2014 09:10:29 +0000 (+0200)
Subject: Merge remote-tracking branch 'githubmirror/master'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=8a248e676cf03ceffefe36dddb604754c2236085;p=puppet-tor.git

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

8a248e676cf03ceffefe36dddb604754c2236085