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
..
2014-08-21 15:09:31 +02:00
2014-08-21 15:09:31 +02:00
2014-08-15 02:16:04 +02:00
2013-10-28 22:45:58 +01:00
2014-08-09 16:33:12 +02:00

*** NixOS ***

NixOS is a Linux distribution based on the purely functional package
management system Nix.  More information can be found at
http://nixos.org/nixos and in the manual in doc/manual.