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	nix: Revert meta attribute removal	2014-09-24 19:00:35 +02:00
unstable.nix	Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv	2014-10-09 10:57:57 +02:00