Peter Simons 91f2c362de Merge remote-tracking branch 'origin/master' into stdenv-updates. ... Conflicts: pkgs/top-level/all-packages.nix		2013-10-26 18:28:05 +02:00
..
default.nix	Merge remote-tracking branch 'origin/master' into stdenv-updates.	2013-10-26 18:28:05 +02:00