William A. Kennington III 6602f49495 Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""
This reverts commit 741bf840dad05cd1728481045466811ae8ae8281.

This reverts the fallout from reverting the major changes.
2015-11-14 12:32:51 -08:00
..
2015-09-22 20:23:23 +02:00
2015-05-31 18:41:34 +02:00
2015-09-22 20:23:23 +02:00
2015-09-27 16:06:29 -05:00
2012-05-11 21:42:00 +00:00