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
..
2014-09-01 09:07:54 +04:00
2014-11-02 17:22:27 -08:00
2014-08-12 20:58:36 +02:00
2014-11-21 11:54:59 +00:00
2014-09-25 00:07:23 +02:00
2015-01-23 16:09:33 +01:00
2015-01-13 22:33:49 +01:00
2014-12-01 17:05:20 +01:00
2015-01-19 15:47:16 +01:00
2014-11-28 00:12:26 +03:00
2014-11-19 19:41:44 +01:00
2015-01-03 21:36:43 +01:00
2015-01-07 14:55:41 -08:00