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

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

a9b391b774eae6d1272368f00e96cab022648326