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-27 09:45:23 -05:00
2015-07-23 18:31:54 +02:00
2015-07-28 21:42:25 +02:00
2015-09-27 09:45:35 -05:00
2015-07-28 18:42:22 +02:00
2014-03-10 15:01:56 +01:00
2015-10-14 18:18:47 +02:00
2015-07-30 13:44:50 +02:00
2013-10-10 13:28:21 +02:00
2015-07-23 18:31:54 +02:00