Merge branch 'rsync-shuffle'

author Stephen Gran <steve@lobefin.net>

Sun, 20 May 2012 20:05:31 +0000 (21:05 +0100)

committer Stephen Gran <steve@lobefin.net>

Sun, 20 May 2012 20:05:31 +0000 (21:05 +0100)
author Stephen Gran <steve@lobefin.net>
Sun, 20 May 2012 20:05:31 +0000 (21:05 +0100)
committer Stephen Gran <steve@lobefin.net>
Sun, 20 May 2012 20:05:31 +0000 (21:05 +0100)
diff --cc modules/debian-org/misc/local.yaml
Simple merge
diff --cc modules/ferm/manifests/per-host.pp
Simple merge
author	Stephen Gran <steve@lobefin.net>
	Sun, 20 May 2012 20:05:31 +0000 (21:05 +0100)
committer	Stephen Gran <steve@lobefin.net>
	Sun, 20 May 2012 20:05:31 +0000 (21:05 +0100)
		1	2
modules/debian-org/misc/local.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
modules/ferm/manifests/per-host.pp	patch \|	diff1 \|	diff2 \|	blob \| history