* Sync with the trunk.

svn path=/nixpkgs/branches/stdenv-updates/; revision=30852
2011-12-12 16:54:35 +00:00
parent 5de58eb387 b0834a993e
commit eda3fd1730
320 changed files with 4058 additions and 2823 deletions
--- a/pkgs/lib/maintainers.nix
+++ b/pkgs/lib/maintainers.nix
@@ -15,6 +15,7 @@
  kkallio = "Karn Kallio <tierpluspluslists@gmail.com>";
  ludo = "Ludovic Courtès <ludo@gnu.org>";
  marcweber = "Marc Weber <marco-oweber@gmx.de>";
+  mornfall = "Petr Ročkai <me@mornfall.net>";
  neznalek = "Vladimír Čunát <vcunat@gmail.com>";
  phreedom = "Evgeny Egorochkin <phreedom.stdin@gmail.com>";
  pierron = "Nicolas B. Pierron <nixos@nbp.name>";