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-20 17:04:52 +02:00
2014-08-07 01:07:34 +02:00
2015-01-08 13:19:46 -08:00
2015-01-14 13:18:00 -08:00
2014-08-24 22:31:37 +02:00
2014-09-23 11:51:46 +02:00
2014-08-24 22:31:37 +02:00
2014-12-17 13:54:13 +00:00
2015-02-01 18:41:32 +03:00
2015-01-07 20:19:23 +01:00
2014-11-02 17:22:27 -08:00
2014-10-30 12:11:24 +03:00
2014-11-11 14:36:34 +01:00
2014-09-22 19:56:49 +02:00
2014-08-24 22:31:37 +02:00
2014-11-05 09:23:25 +03:00
2015-01-13 22:33:49 +01:00
2015-01-18 18:20:09 +03:00
2014-08-24 22:31:37 +02:00
2014-08-24 22:31:37 +02:00
2014-12-16 15:22:53 -08:00