Vladimír Čunát dbae4f109f Merge branch 'master' into staging ... Conflicts (relatively simple): pkgs/applications/audio/spotify/default.nix pkgs/build-support/cc-wrapper/default.nix pkgs/development/compilers/cryptol/1.8.x.nix		2015-01-31 19:34:57 +01:00
..
activation	nixos-rebuild: use reload-or-restart for dbus. Closes #5767	2015-01-14 16:08:47 +01:00
boot	Merge branch 'master' into staging	2015-01-31 19:34:57 +01:00
etc	setup-etc.pl: Fail when symlink/rename fails	2014-10-06 08:00:11 +02:00
upstart	upstart: Oneshot rules should always have Restart=no	2014-04-16 01:04:52 +02:00