nixpkgs/nixos/doc
Vladimír Čunát d4e9fd2a90 Merge recent master into staging
Hydra: ?compare=1148749

Conflicts (easy):
	nixos/modules/virtualisation/containers.nix
2014-08-21 15:09:31 +02:00
..
config-examples Move all of NixOS to nixos/ in preparation of the repository merge 2013-10-10 13:28:20 +02:00
manual Merge recent master into staging 2014-08-21 15:09:31 +02:00