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
doc	Fix a few typos	2013-08-11 10:55:53 +00:00
maintainers	Fix a few typos	2013-08-11 10:55:53 +00:00
pkgs	Merge branch 'master' into stdenv-updates	2013-08-16 22:51:13 +02:00
.gitignore
COPYING
default.nix
VERSION