Peter Simons 76244ac2e2 Merge branch 'master' into stdenv-updates ... Conflicts: pkgs/development/compilers/ghc/with-packages.nix		2013-08-16 22:51:13 +02:00
..
default.nix	Merge branch 'master' into stdenv-updates	2013-08-16 22:51:13 +02:00