Merge branch 'maint'

* maint:
  Update AUTHORS
  Update NEWS

diff --cc AUTHORS.txt
index d42cbae59d406f84a6f783701cbaced74eeffad4,fef2c73cbdad8c1757b747acaeddbd1e13ecafb7..ad0f71905c95827461c10eab1b4aceb2a3352a40
--- 1/AUTHORS.txt
--- 2/AUTHORS.txt
+++ b/AUTHORS.txt
@@@ -10,10 -10,9 +10,10 @@@ ccache is a collective work with contri
  * Andrea Bittau <a.bittau@cs.ucl.ac.uk>
  * Andrew Stubbs <ams@codesourcery.com>
  * Andrew Tridgell <tridge@samba.org>
- * Bernhard Bauer <bauerb@google.com>
+ * Bernhard Bauer <bauerb@chromium.org>
  * Björn Jacke <bj@sernet.de>
  * Bo Rydberg <bolry@hotmail.com>
 +* Chris AtLee <chris@atlee.ca>
  * Clemens Rabe <crabe@gmx.de>
  * Eric Blau <Eric.Blau@tekelec.com>
  * Francois Marier <francois@debian.org>
@@@ -26,8 -23,8 +26,9 @@@
  * Lalit Chhabra <lchhabra@linuxmail.org>
  * Lars Gustäbel <lars@gustaebel.de>
  * Lubos Lunak <l.lunak@suse.cz>
 +* Mark Starovoytov <starovoytov.mark@googlemail.com>
  * Martin Pool <mbp@sourcefrog.net>
+ * Michael Meeks <michael.meeks@suse.com>
  * Owen Mann <owen@mann.org>
  * Patrick von Reth <vonreth@kde.org>
  * Paul Griffith <paulg@cse.yorku.ca>