Eelco Dolstra 811de3bfaa Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv ...

Conflicts:
	pkgs/tools/security/gnupg/default.nix

2014-10-09 10:57:57 +02:00

..

default.nix

…

freebsd_weak_ref.patch

…

freebsd.patch

…