Eelco Dolstra 44d091674b Merge branch 'master' of github.com:NixOS/nixos into systemd ... Conflicts: modules/config/networking.nix modules/services/networking/ssh/sshd.nix modules/services/ttys/agetty.nix modules/system/boot/stage-2-init.sh modules/system/upstart-events/shutdown.nix		2012-07-16 17:27:11 -04:00
..
shutdown.nix	Rename time.clockLocal -> time.hardwareClockInLocalTime.	2012-07-11 15:33:34 -04:00