diff options
author | Jeff McCune <jeff@puppetlabs.com> | 2012-11-28 14:39:34 -0800 |
---|---|---|
committer | Jeff McCune <jeff@puppetlabs.com> | 2012-11-28 14:39:34 -0800 |
commit | 2abf64a3068e184ec9e183a2277b21492be02ea3 (patch) | |
tree | 9727574c5768e0dff18139824078877b2f770252 /.gitignore | |
parent | 89fa98579c1c4c3e70cf3658d0ade76de1230045 (diff) | |
parent | 1e5618c44f1c4ad14c7ba1b3981e950ce7182276 (diff) |
Merge branch '3.x' into 4.x
* 3.x:
Update Modulefile, CHANGELOG for 2.6.0
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions