From: Martin Zobel-Helas Date: Fri, 1 Jan 2010 14:59:31 +0000 (+0100) Subject: Merge remote branch 'origin/staging' into staging X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=556c56455d019797bfa7749c1a358280c33957a1;hp=--cc;p=mirror%2Fdsa-puppet.git Merge remote branch 'origin/staging' into staging --- 556c56455d019797bfa7749c1a358280c33957a1