Merge branch 'master' of github.com:puppetlabs/puppetlabs-vcsrepo
authorRyan Coleman <ryan@puppetlabs.com>
Wed, 19 Sep 2012 20:30:53 +0000 (13:30 -0700)
committerRyan Coleman <ryan@puppetlabs.com>
Wed, 19 Sep 2012 20:30:53 +0000 (13:30 -0700)

Trivial merge