Vladimír Čunát d1df28f8e5 Merge 'staging' into closure-size ... This is mainly to get the update of bootstrap tools. Otherwise there were mysterious segfaults: https://github.com/NixOS/nixpkgs/pull/7701#issuecomment-203389817		2016-04-07 14:40:51 +02:00
..
applications	Merge 'staging' into closure-size	2016-04-07 14:40:51 +02:00
build-support	Merge 'staging' into closure-size	2016-04-07 14:40:51 +02:00
data	tzdata: fixup after merging master	2016-04-02 16:26:32 +02:00
desktops	Merge branch 'master' into closure-size	2016-04-01 10:06:01 +02:00
development	Merge 'staging' into closure-size	2016-04-07 14:40:51 +02:00
games	Merge branch 'master' into closure-size	2016-04-01 10:06:01 +02:00
misc	Merge branch 'master' into closure-size	2016-04-01 10:06:01 +02:00
os-specific	Merge 'staging' into closure-size	2016-04-07 14:40:51 +02:00
servers	Merge 'staging' into closure-size	2016-04-07 14:40:51 +02:00
shells	Merge branch 'master' into closure-size	2016-04-01 10:06:01 +02:00
stdenv	Merge 'staging' into closure-size	2016-04-07 14:40:51 +02:00
test	Merge branch 'master' into closure-size	2016-04-01 10:06:01 +02:00
tools	Merge 'staging' into closure-size	2016-04-07 14:40:51 +02:00
top-level	Merge 'staging' into closure-size	2016-04-07 14:40:51 +02:00