Merge branch 'hook-local-vars' into next

[sup] / CONTRIBUTORS

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 1fd02f19e014f8aa96762403d8faac3c3a643c3b..f75015304c5bcf0fc3e256c5aba070a519bb64c9 100644 (file)
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1,13 +1,22 @@
-William Morgan <wmorgan-sup at the masanjin dot nets>
-Ismo Puustinen <ismo at the iki dot fis>
+Nicolas Pouillard <nicolas.pouillard at the gmail dot coms>
+Mike Stipicevic <stipim at the rpi dot edus>
 Marcus Williams <marcus-sup at the bar-coded dot nets>
 Lionel Ott <white.magic at the gmx dot des>
-Nicolas Pouillard <nicolas.pouillard at the gmail dot coms>
-Marc Hartstein <marc.hartstein at the alum.vassar dot edus>
+Ingmar Vanhassel <ingmar at the exherbo dot orgs>
+Mark Alexander <marka at the pobox dot coms>
+Christopher Warrington <chrisw at the rice dot edus>
+Richard Brown <rbrown at the exherbo dot orgs>
 Ben Walton <bwalton at the artsci.utoronto dot cas>
+Marc Hartstein <marc.hartstein at the alum.vassar dot edus>
 Grant Hollingworth <grant at the antiflux dot orgs>
+Steve Goldman <sgoldman at the tower-research dot coms>
+Decklin Foster <decklin at the red-bean dot coms>
+Ismo Puustinen <ismo at the iki dot fis>
 Jeff Balogh <its.jeff.balogh at the gmail dot coms>
-Christopher Warrington <chrisw at the rice dot edus>
+Alex Vandiver <alexmv at the mit dot edus>
 Giorgio Lando <patroclo7 at the gmail dot coms>
-Decklin Foster <decklin at the red-bean dot coms>
+Israel Herraiz <israel.herraiz at the gmail dot coms>
 Ian Taylor <ian at the lorf dot orgs>
+Stefan Lundström <lundst at the snabb.(none)>
+Rich Lane <rlane at the club.cc.cmu dot edus>
+Kirill Smelkov <kirr at the landau.phys.spbu dot rus>