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
..
cd-dvd
scan
tools	Merge recent master into staging	2014-08-21 15:09:31 +02:00
virtualbox-demo.nix