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
..
cd-dvd	nixos/manual: Use literalExample when feasible.	2014-08-27 23:41:15 +02:00
scan	Rewrite ‘with pkgs.lib’ -> ‘with lib’	2014-04-14 16:26:48 +02:00
tools	Merge recent master into staging	2014-08-30 10:04:02 +02:00
virtualbox-demo.nix	nixos/ova: Grub uuid detection is broken when generating the ova	2014-08-28 13:35:36 -07:00