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
..
2015-01-06 14:41:23 -05:00
2014-11-02 02:05:54 +03:00
2015-01-20 07:31:00 +01:00
2014-10-07 21:50:40 +02:00
2014-11-02 02:04:36 +03:00
2014-11-01 18:59:20 +01:00
2014-08-24 22:31:37 +02:00
2014-08-30 22:52:46 +01:00
2015-01-26 23:48:56 +01:00