From: Martin Zobel-Helas <zobel@debian.org>
Date: Mon, 18 Jan 2010 20:15:06 +0000 (+0100)
Subject: Merge branch 'ferm'
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=e152ea9072eba0cf0b3920c779e3fdb8ad3880fd;p=mirror%2Fdsa-puppet.git

Merge branch 'ferm'
---

e152ea9072eba0cf0b3920c779e3fdb8ad3880fd