Eelco Dolstra bc1773fe16 Merge remote-tracking branch 'origin/staging' into systemd-219 ... Conflicts: pkgs/os-specific/linux/kernel/linux-3.4.nix pkgs/os-specific/linux/systemd/default.nix		2015-07-20 22:57:23 +02:00
..
activation	Merge remote-tracking branch 'origin/staging' into systemd-219	2015-07-20 22:57:23 +02:00
boot	Merge remote-tracking branch 'origin/staging' into systemd-219	2015-07-20 22:57:23 +02:00
etc	Set ‘allowSubstitutes = false’ on various derivations	2015-07-09 15:10:37 +02:00
upstart	upstart: Oneshot rules should always have Restart=no	2014-04-16 01:04:52 +02:00