Ludovic Courtès 53c85e97dc Merge branch 'core-updates' ... Conflicts: gnu/packages/gnunet.scm		2013-11-23 22:30:10 +01:00
..
packages	Merge branch 'core-updates'	2013-11-23 22:30:10 +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