Vladimír Čunát 77da5efc78 merge the rest of multiple-outputs
Conflicts:
	pkgs/development/libraries/glibc/2.19/builder.sh (previous merge taken)
	pkgs/development/tools/misc/patchelf/default.nix (easy)
	pkgs/stdenv/generic/setup.sh (previous merge taken)
2014-08-25 10:41:49 +02:00
..
2014-08-10 18:25:34 +02:00
2013-03-16 20:40:04 +01:00
2014-08-23 16:04:53 +02:00
2014-08-13 23:21:33 +02:00