Vladimír Čunát ab15a62c68 Merge branch 'master' into closure-size ... Beware that stdenv doesn't build. It seems something more will be needed than just resolution of merge conflicts.		2016-04-01 10:06:01 +02:00
..
activation	Merge master into closure-size	2016-03-08 09:58:19 +01:00
boot	Merge branch 'master' into closure-size	2016-04-01 10:06:01 +02:00
etc	etc: Use a friendlier name than "etc-file"	2015-12-30 15:17:30 +01:00