diff options
| author | Jesse Wolfe <jes5199@gmail.com> | 2010-07-12 17:52:14 -0700 |
|---|---|---|
| committer | Jesse Wolfe <jes5199@gmail.com> | 2010-07-12 17:52:14 -0700 |
| commit | 9caa04fd36353f02b5e3e1d343f04a62ba640f64 (patch) | |
| tree | 68704683622dda1079c452871c640e30a81fe892 /lib/puppet/reference/function.rb | |
| parent | 8747479d59fa211f41186c1ab68987bb4af55f0b (diff) | |
| parent | 83d9874e2eba003d83f089a6e6c278f5976d5154 (diff) | |
| download | puppet-9caa04fd36353f02b5e3e1d343f04a62ba640f64.tar.gz puppet-9caa04fd36353f02b5e3e1d343f04a62ba640f64.tar.xz puppet-9caa04fd36353f02b5e3e1d343f04a62ba640f64.zip | |
Merge branch '0.25.x' into next
This is a housekeeping merge: all 0.25.x commits were already
cherry-picked into the 2.6 era's master.
No code was changed by this merge, since I used --strategy=ours
Diffstat (limited to 'lib/puppet/reference/function.rb')
0 files changed, 0 insertions, 0 deletions