diff options
author | Ludovic Courtès <ludo@gnu.org> | 2014-06-06 17:23:14 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2014-06-06 17:23:14 +0200 |
commit | 872c69d00e861f86fa4caaadbaa136f46c9db358 (patch) | |
tree | d50176869e67baf821b151d6bcc879ef0bd554fe /nix-upstream | |
parent | a4d48cc24d0f6bc3c45adf92925d7d901f0763d3 (diff) | |
parent | b15d79dfe65353f4101b0ad653c97e3ef0d4a8b7 (diff) | |
download | guix-872c69d00e861f86fa4caaadbaa136f46c9db358.tar guix-872c69d00e861f86fa4caaadbaa136f46c9db358.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'nix-upstream')
0 files changed, 0 insertions, 0 deletions