Peter Simons 4914e63a89 Merge changes from branch 'master' into stdenv-updates. ... Conflicts: pkgs/development/libraries/icu/default.nix pkgs/tools/misc/coreutils/default.nix		2013-04-19 11:48:11 +02:00
..
default.nix	Merge changes from branch 'master' into stdenv-updates.	2013-04-19 11:48:11 +02:00