From: Joel Rosdahl <joel@rosdahl.net>
Date: Thu, 7 Aug 2014 20:06:17 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: v3.2~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c8ab71ba63225f57d33b064d7fefb268ffc5ef0b;p=thirdparty%2Fccache.git

Merge branch 'maint'

* maint:
  Update AUTHORS
  Update NEWS
---

c8ab71ba63225f57d33b064d7fefb268ffc5ef0b
diff --cc AUTHORS.txt
index d42cbae59,fef2c73cb..ad0f71905
--- a/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>