Eelco Dolstra 7f410ef923 Merge remote-tracking branch 'origin/master' into staging ... Conflicts: pkgs/misc/vim-plugins/default.nix		2014-07-22 11:00:00 +02:00
..
activation	Add system.replaceRuntimeDependencies to quickly replace system dependencies	2014-06-06 21:17:31 +02:00
boot	Merge remote-tracking branch 'origin/master' into staging	2014-07-22 11:00:00 +02:00
etc	Rewrite ‘with pkgs.lib’ -> ‘with lib’	2014-04-14 16:26:48 +02:00
upstart	upstart: Oneshot rules should always have Restart=no	2014-04-16 01:04:52 +02:00