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	Merge recent master into staging	2014-08-21 15:09:31 +02:00
hardware
installer	Merge recent master into staging	2014-08-21 15:09:31 +02:00
misc	nixos/dhcpd: Use dhcp user instead of nobody	2014-08-13 15:08:43 -05:00
profiles	Add user attribute isNormalUser	2014-08-15 02:16:04 +02:00
programs	merge #3428: nano: bump and add system-wide config	2014-08-14 23:51:29 +02:00
security	Don't silently ignore errors from the activation script	2014-08-15 02:14:34 +02:00
services	gnome3: add services.xserver.desktopManager.gnome3.sessionPath	2014-08-14 21:16:40 +02:00
system	Containers: Don't remount /	2014-08-18 17:14:43 +02:00
tasks
testing
virtualisation	Merge recent master into staging	2014-08-21 15:09:31 +02:00
module-list.nix	merge #3428: nano: bump and add system-wide config	2014-08-14 23:51:29 +02:00
rename.nix