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
@@ -141,6 +141,6 @@ stdenv.mkDerivation {
    '';

    platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.simons ];
+    maintainers = [ stdenv.lib.maintainers.simons ];
  };
 }