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-26 02:09:04 +01:00
2014-11-11 14:36:34 +01:00
2014-11-11 14:27:21 -05:00
2014-11-11 14:36:34 +01:00
2015-01-21 20:33:19 -05:00
2014-11-11 14:36:34 +01:00
2014-08-24 22:31:37 +02:00
2015-01-19 14:10:45 +01:00
2014-09-16 13:53:18 +02:00
2014-12-29 01:55:40 +01:00
2014-08-24 22:31:37 +02:00
2014-08-24 22:31:37 +02:00
2014-12-07 14:01:02 +01:00
2015-01-21 12:38:34 +01:00
2015-01-09 15:01:30 -08:00
2015-01-23 19:41:28 +00:00
2014-08-24 22:31:37 +02:00
2015-01-15 16:10:07 -06:00
2015-01-03 21:45:16 -08:00
2014-08-24 22:31:37 +02:00
2015-01-07 13:59:38 +01:00
2015-01-18 01:58:20 +03:00
2015-01-13 22:33:49 +01:00
2015-02-02 18:03:23 -08:00
2015-01-07 09:55:22 +00:00