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
..
4.13a.nix	Merge branch 'upstream-master' into stdenv-updates	2013-02-19 10:09:39 -05:00
5.2.nix	Merge remote-tracking branch 'origin/master' into stdenv-updates.	2013-10-26 18:28:05 +02:00