Merge Author files

Signed-off-by: Fabio M. Di Nitto <[email protected]>

AUTHORS

@@ -1,29 +1,59 @@
 Authors:  
 --------  
+A. J. Lewis <alewis at redhat.com>
+Abhijith Das <adas at redhat.com>
+Adam Manthei <amanthei at redhat.com>
 Akamatsu Hiroshi <[email protected]>
 Alan Robertson <[email protected]>
+Alasdair G. Kergon <agk at redhat.com>
 Andrew Beekhof <[email protected]>  
+Andrew Price <andy at andrewprice.me.uk>
+Benjamin Marzinski <bmarzins at redhat.com>
+Bob Peterson <rpeterso at redhat.com>
+Chris Feist <cfeist at redhat.com>
 Christian Rishoj <[email protected]>
+Christine Caulfield <ccaulfie at redhat.com>
 Daiki Matsuda <[email protected]>
+Daniel Phillips <phillips at redhat.com>
 David Lee <[email protected]>
+David Teigland <teigland at redhat.com>
 Dejan Muhamedagic <[email protected]>
 Dominik Klein <[email protected]>
+Fabio M. Di Nitto <fdinitto at redhat.com>
 Florian Haas <[email protected]>
 Hideo Yamauchi <[email protected]>
 Horms <[email protected]>
 Huang Zhen <[email protected]>
+James Parsons <jparsons at redhat.com>
 Jean-Francois Larvoire <[email protected]>
+Joel Becker <joel.becker at oracle.com>
+Jonathan Brassow <jbrassow at redhat.com>
 Keisuke MORI <[email protected]>
+Ken Preslan <kpreslan at redhat.com>
 Lars Marowsky-Bree <[email protected]>
+Lon Hohberger <lhh at redhat.com>
+Marc - A. Dahlhaus <mad at wol.de>
+Marek 'marx' Grac <mgrac at redhat.com>
+Mark Hlawatschek <hlawatschek at atix.de>
 Matthew Soffen
+Michael Conrad Tadpol Tilstra <mtilstra at redhat.com>
 Michael Schwartzkopff <[email protected]>
 Nakahira Kazutomo <[email protected]>
+Patrick Caulfield <pcaulfie at redhat.com>
 Philipp Kolmann <[email protected]>
 Raoul Bhatia <[email protected]>
+Robert Peterson <rpeterso at redhat.com>
 Ron Terry <[email protected]>
+Ross Vandegrift <ross at kallisti.us>
+Ryan McCabe <rmccabe at redhat.com>
+Ryan O'Hara <rohara at redhat.com>
 Sebastian Reitenbach <[email protected]>
 Serge Dubrouski <[email protected]>
 Simon Horman <[email protected]>
+Stanko Kupcevic <kupcevic at redhat.com>
 Stephan Berlet <[email protected]>
+Steven Whitehouse <swhiteho at redhat.com>
 Takenaka Kazuhiro <[email protected]>
+Wendy Cheng <wcheng at redhat.com>
 Xinwei Hu <[email protected]>
+jparsons <jparsons at redhat.com>

doc/COPYRIGHT

@@ -63,36 +63,3 @@ rgmanager/src/resources/smb.sh:
  Author(s):
   Lon Hohberger (lhh at redhat.com)
   Tim Burke (tburke at redhat.com)
-
-Authors as known by current RCS as of the time of writing:
-
-Abhijith Das <adas at redhat.com>
-Adam Manthei <amanthei at redhat.com>
-A. J. Lewis <alewis at redhat.com>
-Alasdair G. Kergon <agk at redhat.com>
-Andrew Price <andy at andrewprice.me.uk>
-Benjamin Marzinski <bmarzins at redhat.com>
-Bob Peterson <rpeterso at redhat.com>
-Chris Feist <cfeist at redhat.com>
-Christine Caulfield <ccaulfie at redhat.com>
-Daniel Phillips <phillips at redhat.com>
-David Teigland <teigland at redhat.com>
-Fabio M. Di Nitto <fdinitto at redhat.com>
-James Parsons <jparsons at redhat.com>
-Joel Becker <joel.becker at oracle.com>
-Jonathan Brassow <jbrassow at redhat.com>
-jparsons <jparsons at redhat.com>
-Ken Preslan <kpreslan at redhat.com>
-Lon Hohberger <lhh at redhat.com>
-Marc - A. Dahlhaus <mad at wol.de>
-Marek 'marx' Grac <mgrac at redhat.com>
-Mark Hlawatschek <hlawatschek at atix.de>
-Michael Conrad Tadpol Tilstra <mtilstra at redhat.com>
-Patrick Caulfield <pcaulfie at redhat.com>
-Robert Peterson <rpeterso at redhat.com>
-Ross Vandegrift <ross at kallisti.us>
-Ryan McCabe <rmccabe at redhat.com>
-Ryan O'Hara <rohara at redhat.com>
-Stanko Kupcevic <kupcevic at redhat.com>
-Steven Whitehouse <swhiteho at redhat.com>
-Wendy Cheng <wcheng at redhat.com>