Peter Simons 9407832de4 Merge remote-tracking branch 'origin/master' into stdenv-updates. ... Conflicts: pkgs/development/libraries/gettext/default.nix		2013-09-23 10:59:44 +02:00
..
default.nix	Merge remote-tracking branch 'origin/master' into stdenv-updates.	2013-09-23 10:59:44 +02:00
gets-undeclared.patch