Marius Bakke 84157bb8bf Merge branch 'master' into core-updates ... Most conflicts are from 6fd52309b8.		2017-03-30 22:59:53 +02:00
..
evaluate.scm	hydra: 'evaluate' now validates job alists.	2016-06-21 15:59:06 +02:00
gnu-system.scm	Merge branch 'master' into core-updates	2017-03-30 22:59:53 +02:00
guix.scm	hydra: Add missing phase and inputs for 'make dist' job.	2016-01-13 17:43:21 +01:00