Peter Simons 45e8de9a7d Merge branch 'origin/master' into stdenv-updates. ... Conflicts: pkgs/tools/misc/less/default.nix		2013-12-16 21:13:24 +01:00
..
default.nix	Merge branch 'origin/master' into stdenv-updates.	2013-12-16 21:13:24 +01:00