3
0
Fork 0
forked from mirrors/nixpkgs
nixpkgs/pkgs/applications/editors/ed
Vladimír Čunát e51f73652d Merge recent master into staging
Hydra: ?compare=1149952

Conflicts:
	nixos/doc/manual/configuration.xml (changed split file)
	nixos/modules/config/users-groups.nix (choosing filterNull instead of inline definition)
	pkgs/development/libraries/readline/readline6.3.nix (auto-solved)
2014-08-30 10:04:02 +02:00
..
default.nix Merge recent master into staging 2014-08-30 10:04:02 +02:00