Ludovic Courtès 01e354eb83 Merge branch 'core-updates' ... Conflicts: guix/build/union.scm		2013-01-11 16:01:49 +01:00
..
fdl-1.3.texi	doc: Add the stub of a manual.	2012-10-13 16:05:01 +02:00
guix.texi	Merge branch 'core-updates'	2013-01-11 16:01:49 +01:00