2 Commits

Author	SHA1	Message	Date
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
Mikey Ariel	a099ca4505	Chunk NixOS manual ... [Squashed commits to make git blame etc. more likely to work. -ED]	2014-08-26 19:03:49 +02:00