From: Stephen Gran Date: Tue, 27 Jul 2010 07:45:26 +0000 (+0100) Subject: Merge branch 'master' of ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=ee8209ce835c10c1de47ef56c4ec8ebd3173da2d;hp=-c;p=mirror%2Fdsa-puppet.git Merge branch 'master' of ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet --- ee8209ce835c10c1de47ef56c4ec8ebd3173da2d