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
..
2013-03-16 21:08:57 +01:00
2013-03-16 20:40:04 +01:00
2013-01-28 17:19:02 +01:00
2013-01-29 11:44:08 +01:00
2013-04-04 14:27:44 +02:00