Merge remote-tracking branch 'lauren/master'
authorMatthaus Owens <matthaus@puppetlabs.com>
Sat, 16 Feb 2013 03:16:31 +0000 (19:16 -0800)
committerMatthaus Owens <matthaus@puppetlabs.com>
Sat, 16 Feb 2013 03:16:31 +0000 (19:16 -0800)
commitdc2a963a57105ec22cc8fcd5173c1a78025c0a7e
treefb5a6f09f6844cbd55c38ec374f5ae48f82a7faa
parent5a87544aa91e3d945d63464e9144fe59bbd0f654
parent6d8a013bbea8f71919d2df8e64c24e05b2ca840c
Merge remote-tracking branch 'lauren/master'

Conflicts:
README.md
README.md