Vladimír Čunát ae74c356d9 Merge recent 'staging' into closure-size ... Let's get rid of those merge conflicts.		2016-02-03 16:57:19 +01:00
..
plugins	Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""	2015-11-14 12:32:51 -08:00
2.8.nix	Merge recent 'staging' into closure-size	2016-02-03 16:57:19 +01:00