From: Martin Zobel-Helas <zobel@debian.org>
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=fcbf04aea39b64665b78d2e48b7a38b5f6579514;p=mirror%2Fdsa-puppet.git

Merge remote branch 'origin/staging' into staging
---