team-ghc.md

@@ -381,25 +381,25 @@ This list people who have contributed wonderful things to GHC in the past, but a
 ## Contributors
 
 
-Listed by year of last contribution. The total number of commits to the ghc repository is shown in parenthesis (December 2014).
+Listed by year of last contribution. The total number of commits to the ghc repository, excluding merge commits, is shown in parenthesis (December 2014).
 
 ### 2014
 
-- Simon Marlow (11245)
-- Simon Peyton Jones (8041)
-- Austin Seipp (616)
-- David Terei (488)
-- Herbert Valerio Riedel (413)
+- Simon Marlow (11229)
+- Simon Peyton Jones (7633)
+- Austin Seipp (630)
+- David Terei (478)
+- Herbert Valerio Riedel (411)
 - Joachim Breitner (346)
-- Edward Z. Yang (316)
-- Jose Pedro Magalhaes (245)
-- Richard Eisenberg (218)
+- Edward Z. Yang (319)
+- Jose Pedro Magalhaes (211)
+- Richard Eisenberg (211)
 - Gabor Greif (208)
 - Duncan Coutts (171)
-- Iavor S. Diatchki (158)
-- Jan Stolarek (118)
-- Geoffrey Mainland (111)
-- Johan Tibell (105)
+- Iavor S. Diatchki (121)
+- Jan Stolarek (119)
+- Geoffrey Mainland (107)
+- Johan Tibell (98)
 - Sergei Trofimovich (79)
 - Krzysztof Gogolewski (68)
 - Andreas Voellmy (61)
@@ -424,9 +424,9 @@ Listed by year of last contribution. The total number of commits to the ghc repo
 - Kyrill Briantsev (7)
 - Peter Trommler (7)
 - Simon Hengel (7)
-- Sjoerd Visscher (7)
 - Yuras Shumovich (7)
 - Lennart Kolmodin (6)
+- Sjoerd Visscher (6)
 - Carter Tazio Schonwald (5)
 - Greg Weber (5)
 - Michael Orlitzky (5)
@@ -444,6 +444,7 @@ Listed by year of last contribution. The total number of commits to the ghc repo
 - Muhaimin Ahsan (3)
 - Yorick Laupa (3)
 - Yuri de Wit (3)
+- Adam Gundry (2)
 - Bob Ippolito (2)
 - Christian Maeder (2)
 - Csernik Flaviu Andrei (2)
@@ -458,13 +459,13 @@ Listed by year of last contribution. The total number of commits to the ghc repo
 - Thomas Winant (2)
 - Vitaly Bragilevsky (2)
 - Ömer Sinan Ağacan (2)
-- Adam Gundry (1)
 - Alex Petrov (1)
 - Andrew Gibiansky (1)
 - Baldur Blöndal (1)
 - Benno Fünfstück (1)
 - Boris Egorov (1)
 - Brian Brooks (1)
+- Brian McKenna (1)
 - Carlos Tomé (1)
 - Chris Catalfo (1)
 - Chris Dueck (1)
@@ -501,24 +502,23 @@ Listed by year of last contribution. The total number of commits to the ghc repo
 
 ### 2013
 
-- Ian Lynagh (7113)
-- Manuel M T Chakravarty (751)
-- Ross Paterson (632)
-- Ben Lippmeier (346)
-- Max Bolingbroke (271)
+- Ian Lynagh (6868)
+- Manuel M T Chakravarty (749)
+- Ross Paterson (630)
+- Ben Lippmeier (338)
+- Max Bolingbroke (264)
 - Twan van Laarhoven (150)
-- Daniel Fischer (107)
-- Patrick Palka (72)
-- David Waern (44)
+- Daniel Fischer (96)
+- Patrick Palka (67)
 - Takano Akio (22)
 - Nicolas Frisby (19)
 - PHO (18)
 - Michal Terepeta (17)
-- Ryan Newton (17)
+- Ryan Newton (15)
 - Niklas Hambüchen (10)
 - Bryan O'Sullivan (9)
 - shelarcy (8)
-- Amos Robinson (6)
+- Amos Robinson (5)
 - Stephen Blackheath (5)
 - Ben Chan (3)
 - Boris Sukholitko (3)
@@ -541,9 +541,9 @@ Listed by year of last contribution. The total number of commits to the ghc repo
 
 ### 2012
 
-- Roman Leshchinskiy (393)
-- Paolo Capriotti (175)
-- Dimitrios Vytiniotis (122)
+- Roman Leshchinskiy (392)
+- Paolo Capriotti (170)
+- Dimitrios Vytiniotis (89)
 - Bas van Dijk (39)
 - Gabriele Keller (26)
 - Judah Jacobson (18)
@@ -572,6 +572,7 @@ Listed by year of last contribution. The total number of commits to the ghc repo
 
 - Malcolm Wallace (225)
 - Thomas Schilling (119)
+- David Waern (31)
 - Matthias Kilian (25)
 - Thorkil Naur (19)
 - David M Peixotto (11)
@@ -751,7 +752,10 @@ Listed by year of last contribution. The total number of commits to the ghc repo
 
 - David Turner (8)
 
-### Other wonderful contributors
+### Other wonderful past contributors
+
+
+These people have also contributed to GHC and its core libraries in the past, in various wonderful ways:
 
 - Andrew Cheadle
 - Ben Rudiak-Gould