Merge branch 'origin/master' into stdenv.

2013-08-17 10:00:16 +02:00
parent 76244ac2e2 898348a80d
commit 0d7118814b
138 changed files with 149 additions and 147 deletions
@@ -64,6 +64,6 @@ mkDerivation rec {
    license = "GPLv2+";

    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
-    maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.phreedom ];
+    maintainers = [ stdenv.lib.maintainers.phreedom ];
  };
 }