summary refs log tree commit diff
path: root/daemon.am
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2014-08-03 21:01:18 -0400
committerMark H Weaver <mhw@netris.org>2014-08-03 21:01:18 -0400
commit8ceaf72c6d50e564d6db49479e9facbb2201c3e3 (patch)
treee558765dcfcb1c954b68f200760180d199926803 /daemon.am
parent33690ffde5af2c516bc6b2dd060ab9cf7ab88eb2 (diff)
parent684a2f59748d55de62b45c190127b704d4cdcb60 (diff)
downloadguix-8ceaf72c6d50e564d6db49479e9facbb2201c3e3.tar.gz
Merge branch 'master' into core-updates
Diffstat (limited to 'daemon.am')
0 files changed, 0 insertions, 0 deletions