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-05-22 14:20:23 +02:00
2014-04-18 00:45:26 +02:00
2014-05-06 20:04:22 +02:00