Marius Bakke 84157bb8bf Merge branch 'master' into core-updates ... Most conflicts are from 6fd52309b8.		2017-03-30 22:59:53 +02:00
..
evaluate.scm
gnu-system.scm	Merge branch 'master' into core-updates	2017-03-30 22:59:53 +02:00
guix.scm