Peter Simons 522acfd2f4 Merge remote-tracking branch 'master' into stdenv-updates. ... Conflicts: pkgs/applications/version-management/git-and-tools/git/default.nix pkgs/top-level/all-packages.nix		2013-07-30 11:29:30 +02:00
..
default.nix	Merge remote-tracking branch 'master' into stdenv-updates.	2013-07-30 11:29:30 +02:00