Merge branch 'master' of git://github.com/puppetlabs/puppetlabs-stdlib into leap_master
authorvarac <varacanero@zeromail.org>
Tue, 27 Aug 2013 16:03:56 +0000 (18:03 +0200)
committervarac <varacanero@zeromail.org>
Tue, 27 Aug 2013 16:03:56 +0000 (18:03 +0200)

Trivial merge