diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-10-09 10:57:57 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-10-09 10:57:57 +0200 |
| commit | 811de3bfaabc39a7a7d22ba34053cfb1a2c4e219 (patch) | |
| tree | 631d4305b76e948baefb54741fe2ea3c4dd9fe8b | |
| parent | c34932ef86628b8b30284882d8baaef4c56320dd (diff) | |
| parent | a2c7804903cdd41d1905fa954bd2dba5e165e793 (diff) | |
Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv
Conflicts:
pkgs/tools/security/gnupg/default.nix