Ludovic Courtès 7db9608d52 Merge branch 'master' into core-updates ... Conflicts: guix/packages.scm		2013-11-08 21:58:09 +01:00
..
packages	Merge branch 'master' into core-updates	2013-11-08 21:58:09 +01:00
system	gnu: vm: Rewrite helper functions as monadic functions.	2013-10-03 23:12:20 +02:00
packages.scm	ui: Add a 'define-diagnostic' macro.	2013-04-21 08:08:40 +00:00