From: Stephen Gran <steve@lobefin.net>
Date: Sun, 20 May 2012 20:05:31 +0000 (+0100)
Subject: Merge branch 'rsync-shuffle'
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=650335318c9021ace96b0cb6d49a13c1a472271f;p=mirror%2Fdsa-puppet.git

Merge branch 'rsync-shuffle'
---

650335318c9021ace96b0cb6d49a13c1a472271f