Merge branch 'master' into stdenv-updates.

This commit is contained in:
Peter Simons
2013-01-11 15:46:10 +01:00
124 changed files with 1323 additions and 272 deletions
+1
View File
@@ -10,6 +10,7 @@
andres = "Andres Loeh <ksnixos@andres-loeh.de>";
antono = "Antono Vasiljev <self@antono.info>";
astsmtl = "Alexander Tsamutali <astsmtl@yandex.ru>";
aszlig = "aszlig <aszlig@redmoonstudios.org>";
bbenoist = "Baptist BENOIST <return_0@live.com>";
bjg = "Brian Gough <bjg@gnu.org>";
bluescreen303 = "Mathijs Kwik <mathijs@bluescreen303.nl>";