diff options
author | Mark H Weaver <mhw@netris.org> | 2016-03-12 15:07:41 -0500 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2016-03-12 15:07:41 -0500 |
commit | 2c9f0b077018d2cac599bd2f466769cd5ffd3adc (patch) | |
tree | 57471e07a36c096bc9223b2fc76cced32eafa04b /Makefile.am | |
parent | f5a9103991531d17bd1d5a944dcec1c49fb9f395 (diff) | |
parent | 9591e11a4c87982943c9eb527b3b1d72aab8cc08 (diff) | |
download | guix-2c9f0b077018d2cac599bd2f466769cd5ffd3adc.tar.gz guix-2c9f0b077018d2cac599bd2f466769cd5ffd3adc.zip |
Merge branch 'master' into security-updates
Diffstat (limited to 'Makefile.am')
0 files changed, 0 insertions, 0 deletions