Merge branch 'master' into x-updates

2013-08-22 19:29:09 +02:00
parent af0e6b6b2b d28a189af6
commit c1e62e7e91
615 changed files with 24465 additions and 25888 deletions
@@ -26,7 +26,7 @@ let
    license = "GPLv3+";

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

  gnuForkSrc = rec {