Ludovic Courtès edae5b3d50 Merge branch 'master' into core-updates ... Conflicts: guix/packages.scm		2013-11-20 23:51:26 +01:00
..
packages	Merge branch 'master' into core-updates	2013-11-20 23:51:26 +01:00
system	gnu: vm: Really create a QCOW2-format image.	2013-11-19 00:03:29 +01:00
packages.scm	ui: Add a 'define-diagnostic' macro.	2013-04-21 08:08:40 +00:00