Peter Simons c32bf83301 Merge remote-tracking branch 'origin/master' into stdenv-updates. ... Conflicts: pkgs/development/interpreters/perl/5.16/default.nix pkgs/tools/networking/curl/default.nix pkgs/top-level/all-packages.nix pkgs/top-level/release-python.nix pkgs/top-level/release-small.nix pkgs/top-level/release.nix		2013-12-04 18:33:52 +01:00
..
default.nix	Merge remote-tracking branch 'origin/master' into stdenv-updates.	2013-12-04 18:33:52 +01:00
docbook2texi.patch	git: Update to 1.8.4	2013-09-30 17:19:06 +02:00
symlinks-in-bin.patch	git: Properly use symlinks instead of hard links	2013-04-22 15:55:01 +02:00