From: Stephen Gran <steve@lobefin.net>
Date: Sat, 9 Jan 2010 12:24:01 +0000 (+0000)
Subject: Merge branch 'master' into staging
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-puppet.git;a=commitdiff_plain;h=ac5b65349283c0e3350b01aad5a263a4eb5b56a1

Merge branch 'master' into staging
---

ac5b65349283c0e3350b01aad5a263a4eb5b56a1