Merge remote branch 'origin/master'
authorDan Bode <dan@puppetlabs.com>
Mon, 11 Oct 2010 15:35:19 +0000 (08:35 -0700)
committerDan Bode <dan@puppetlabs.com>
Mon, 11 Oct 2010 15:35:19 +0000 (08:35 -0700)
commit5bb0d8bf21187e153ae13f11dabbf3f4605a09bb
tree64b9bb586d36caa5f0790adb2f55af878867ed1a
parent350a018958865d68b503b7ee62d60cd2704a41a0
parent845c14ea3524201a7b6b075a60040c05a77f16d1
Merge remote branch 'origin/master'