Shea Levy c45372f038 Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae' ... Partial staging merge, including cc-wrapper fixes Conflicts: pkgs/applications/audio/spotify/default.nix pkgs/build-support/cc-wrapper/default.nix pkgs/development/compilers/cryptol/1.8.x.nix		2015-02-02 21:14:28 -05:00
..
activation	nixos-rebuild: use reload-or-restart for dbus. Closes #5767	2015-01-14 16:08:47 +01:00
boot	Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'	2015-02-02 21:14:28 -05:00
etc
upstart