diff options
| author | Jeff McCune <jeff@puppetlabs.com> | 2013-02-25 14:19:13 -0800 |
|---|---|---|
| committer | Jeff McCune <jeff@puppetlabs.com> | 2013-02-25 14:19:13 -0800 |
| commit | 9a06f11b11c96fff20a2e62c69a29684d943b773 (patch) | |
| tree | 6c523fd16a2f9f6bbcb87109fabc17e3c9e79f17 /lib/puppet/parser | |
| parent | 5b81c26d94eb763eeb044b484a22b56f71c0cd5e (diff) | |
| parent | e0a2dc5b918482a5c05c0d7a6647f4e8a537616f (diff) | |
| download | puppet-stdlib-9a06f11b11c96fff20a2e62c69a29684d943b773.tar.gz puppet-stdlib-9a06f11b11c96fff20a2e62c69a29684d943b773.tar.bz2 | |
Merge branch '4.x'
* 4.x:
(maint) Add Ruby 2.0.0 to Travis build matrix
Conflicts:
.gitignore
.travis.yml
Gemfile
Diffstat (limited to 'lib/puppet/parser')
0 files changed, 0 insertions, 0 deletions