Update from upstream Nix.

This commit is contained in:
Ludovic Courtès 2013-02-19 22:43:07 +01:00
parent 9fd72fb1ff
commit 15b673ebe8

@ -1 +1 @@
Subproject commit e42df686f309c5cd08a8653207e79e9caae37b67
Subproject commit 3e067ac11c1621f989011432f619652a9c20e6f4