Merge pull request #37 from kbarber/ticket/master/13289
authorRyan Coleman <ryan@puppetlabs.com>
Fri, 23 Mar 2012 23:02:26 +0000 (16:02 -0700)
committerRyan Coleman <ryan@puppetlabs.com>
Fri, 23 Mar 2012 23:02:26 +0000 (16:02 -0700)
Ticket/master/13289 Style violations & rspec cleanup


Trivial merge