Merge branch '2.6.x' into next

* 2.6.x:
  (#5304) Use internal_name rather than real_name for maillist provider
  Updated CHANGELOG and version for 2.6.4
  Revert "(#5304) Use internal_name rather than real_name for maillist provider"
  Disable remote ralsh by default
  (#5424) Ship auth.conf as part of installing from source
  (#5304) Use internal_name rather than real_name for maillist provider
  Renamed Reductive to Puppet

Manually Resolved Conflicts:
	lib/puppet/provider/maillist/mailman.rb

1 files changed, 1 insertions, 1 deletions

diff --git a/test/test b/test/test
index 097885751..c8b9b08ef 100755
--- a/test/test
+++ b/test/test
@@ -68,7 +68,7 @@
 #
 # = Copyright
 #
-# Copyright (c) 2005 Reductive Labs, LLC
+# Copyright (c) 2005 Puppet Labs, LLC
 # Licensed under the GNU Public License
 
 require 'find'