summaryrefslogtreecommitdiff
path: root/LICENSE
diff options
context:
space:
mode:
authorJeff McCune <jeff@puppetlabs.com>2012-10-25 15:53:40 -0700
committerJeff McCune <jeff@puppetlabs.com>2012-10-25 15:53:40 -0700
commitcc670fb3b1294a348e9afa03b75cbed8eb08ca36 (patch)
treed12ce301afda40841c92388127e25398a230103f /LICENSE
parentf7baf367508596300d0cc8d3602a3874125b74a1 (diff)
parent1bb4c7a79ea8eb47e08e859d82ffbb4c4be33592 (diff)
Merge branch '2.5.x' into 2.x
* 2.5.x: Update Modulefile, CHANGELOG for 2.5.1
Diffstat (limited to 'LICENSE')
0 files changed, 0 insertions, 0 deletions