Merge branch 'master' into 1.4.x

Conflicts:
	doc/appendix/contributors.txt
	schemas/bundle.xsd
	src/lib/Bcfg2/Client/Tools/__init__.py
	src/lib/Bcfg2/Server/Encryption.py
	src/lib/Bcfg2/Server/Lint/Genshi.py
	src/lib/Bcfg2/Server/Plugins/Bundler.py
	src/lib/Bcfg2/Server/Plugins/Decisions.py
	src/lib/Bcfg2/Server/Plugins/TemplateHelper.py
	src/sbin/bcfg2-test
	testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIX/Test__init.py
	testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIXUsers.py
	testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testhelpers.py
	testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestProperties.py
	tools/bcfg2-profile-templates.py

1 files changed, 0 insertions, 64 deletions

diff --git a/AUTHORS b/AUTHORS
deleted file mode 100644
index d2bebd02f..000000000
--- a/AUTHORS
+++ /dev/null
@@ -1,64 +0,0 @@
-In no particular order:
-
-- Narayan Desai <desai@mcs.anl.gov> has written most of Bcfg2,
-  including all parts not explicitly mentioned in this file.
-
-- Sol Jerome <sol.jerome@gmail.com> squashes bugs, helps manage the
-  project roadmap, and implements various interesting features.
-
-- Tim Laszlo <tim.laszlo@gmail.com> worked on the reporting system and
-  made plugins.
-
-- Fabian Affolter <mail@fabian-affolter.ch> made some patches, added  
-  some new features and plugins, and restructured the manual for Bcfg2.
-
-- Andrew Brestick <brestick@mcs.anl.gov> fixed bugs and completed 
-  plugins.
-
-- James Yang <jjyang@mcs.anl.gov> worked on bcfg2-admin and 
-  bcfg2-reports.
-
-- Robert Gogolok <gogo@cs.uni-sb.de> fixed bugs and made the code more
-  robust.
-
-- Jack Neely <jjneely@ncsu.edu> worked on YUMng.
-
-- Joey Hagedorn <hagedorn@mcs.anl.gov> has written the reporting
-  subsystem, including StatReports, GenerateHostinfo, and the xslt,
-  css and javascript associated with it.
-
-- Ed Smith <esmith4@inf.ed.ac.uk> has done substantial hardening of
-  the Bcfg2 client and server and implemented a common logging
-  infrastructure.
-
-- Rick Bradshaw <bradshaw@mcs.anl.gov> has written several of the
-  tools included in the tools/ subdirectory.
-
-- Ken Raffenetti <raffenet@mcs.anl.gov> and Rick Bradshaw have written
-  the Hostbase plugin.
-
-- Scott Behrens <behrens@mcs.anl.gov> and Rick Bradshaw have written
-  the VHost plugin.
-
-- Cory Lueninghoener <cory@mcs.anl.gov> wrote the showentries function
-  in bcfg2-info.
-
-- Chris Vuletich <vuletich@mcs.anl.gov> wrote some SSL code and the
-  verification debugging code.
-
-- Daniel Clark <dclark@pobox.com> created encap packages for Bcfg2 and
-  deps, wrote fossil-scm dvcs support, and helps with debian packaging
-
-- Jason Pepas <cell@ices.utexas.edu> has written a rpm package list
-  creator has contributed patches to the Red Hat toolset.
-
-- Sami Haahtinen <ressu@ressukka.net> has writen debian packaging
-  logic.
-
-- Brian Pellin and Andrew Lusk did substantial work on Bcfg1, some of
-  which was used in the Bcfg2 client.
-
-- Michael Jinks <mjinks@uchicago.edu> wrote the gentoo tool drivers.
-
-- Chris St. Pierre <stpierreca@ornl.gov> (re)wrote bcfg2-lint and has
-  made other miscellaneous contributions.