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-12-10 09:48:11 +00:00
2015-01-13 22:33:49 +01:00
2014-11-29 06:14:53 +00:00
2014-12-26 12:28:15 -05:00
2014-11-20 08:38:09 -06:00
2015-01-19 09:31:35 +00:00
2015-01-18 11:17:49 +01:00
2015-01-18 11:17:49 +01:00
2014-10-24 23:04:48 -05:00
2015-01-26 22:41:27 -08:00
2015-01-22 21:49:41 -05:00
2015-01-02 00:01:40 +01:00
2014-08-24 22:31:37 +02:00
2014-08-24 22:31:37 +02:00
2014-08-20 01:43:31 -05:00
2015-01-07 12:56:59 +01:00
2014-09-13 12:26:07 +02:00
2015-01-13 22:33:49 +01:00
2015-01-20 09:30:09 +01:00
2014-11-20 17:58:10 +01:00
2014-11-10 10:03:52 +01:00
2014-11-18 07:26:16 +00:00
2014-12-25 11:44:33 +01:00
2015-01-19 14:50:52 +01:00
2015-01-01 15:45:30 +01:00
2014-08-24 22:31:37 +02:00
2014-11-13 20:51:32 +00:00
2015-01-15 00:11:14 +01:00
2014-07-22 11:01:32 +02:00
2015-01-27 14:04:53 +01:00