Vladimír Čunát b4af993c3f Merge branch 'master' into staging ... Conflicts (simple): pkgs/development/lisp-modules/clwrapper/setup-hook.sh		2014-11-14 14:28:23 +01:00
..
activation	nixos-rebuild: reload dbus before starting other units. Closes #4546	2014-11-08 19:40:28 +01:00
boot	Merge branch 'master' into staging	2014-11-14 14:28:23 +01:00
etc	setup-etc.pl: Keep track of copied files	2014-07-25 14:29:08 +02:00
upstart	upstart: Oneshot rules should always have Restart=no	2014-04-16 01:04:52 +02:00