summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff McCune <jeff@puppetlabs.com>2012-10-25 11:29:38 -0700
committerJeff McCune <jeff@puppetlabs.com>2012-10-25 11:29:38 -0700
commit0879388845a2eed76d45d08b2a67d3dee8f8a1f6 (patch)
tree40bb15194a6b334cf9ca2439c3cfa65d5d71ab3c
parent7d8df4b99829d2afe1b13d667bb2e0fbd0374412 (diff)
parent48b3e3b8eae86deecad19896eb88da9ee7d5a625 (diff)
Merge branch '4.x'
* 4.x: Revert "Revert "Revert "Revert "Merge branch 'hkenney-ticket/master/2157_remove_facts_dot_d'"""" Revert "Revert "Revert "Merge branch 'hkenney-ticket/master/2157_remove_facts_dot_d'"""
0 files changed, 0 insertions, 0 deletions