Merge remote-tracking branch 'origin/master' into stdenv-updates.

2013-02-18 11:54:56 +01:00
parent e259e52a7d b076ab94d6
commit 9e68734d61
53 changed files with 335 additions and 93 deletions
@@ -20,6 +20,7 @@
  garbas = "Rok Garbas <rok@garbas.si>";
  goibhniu = "Cillian de Róiste <cillian.deroiste@gmail.com>";
  guibert = "David Guibert <david.guibert@gmail.com>";
+  iElectric = "Domen Kozar <domen@dev.si>";
  jcumming = "Jack Cummings <jack@mudshark.org>";
  kkallio = "Karn Kallio <tierpluspluslists@gmail.com>";
  ludo = "Ludovic Courtès <ludo@gnu.org>";