Merge branch 'origin/master' into stdenv.

This commit is contained in:
Peter Simons
2013-08-17 10:00:16 +02:00
138 changed files with 149 additions and 147 deletions
@@ -219,7 +219,7 @@ stdenv.mkDerivation ({
license = "LGPLv2+";
maintainers = [ stdenv.lib.maintainers.ludo ];
maintainers = [ ];
#platforms = stdenv.lib.platforms.linux;
} // meta;
}