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-14 15:41:51 +00:00
2014-10-07 16:23:27 +04:00
2015-01-21 10:54:54 +01:00
2015-01-14 14:23:46 +01:00
2015-01-13 22:33:49 +01:00
2014-08-24 22:31:37 +02:00
2014-08-24 22:31:37 +02:00
2014-09-23 11:33:40 +02:00
2015-01-26 01:44:33 -06:00
2014-08-30 13:48:02 +01:00
2014-10-07 10:47:39 +02:00
2014-11-02 17:22:27 -08:00
2014-12-27 22:13:41 +01:00
2014-08-24 22:31:37 +02:00
2015-01-13 22:33:49 +01:00
2014-11-04 12:19:37 +03:00
2014-12-29 10:23:27 +01:00
2014-12-22 09:36:20 +00:00
2014-11-11 14:36:34 +01:00
2015-01-23 19:41:28 +00:00
2014-10-08 20:23:25 +02:00
2014-08-24 22:31:37 +02:00
2014-08-24 22:31:37 +02:00
2014-09-25 23:58:53 +02:00
2014-12-20 21:54:22 +01:00
2014-11-03 16:54:38 +03:00