Mark H Weaver 933204e5b1 Merge branch 'master' into core-updates ... Conflicts: gnu-system.am gnu/packages/gstreamer.scm		2015-04-17 09:54:11 -04:00
..
images	doc: Add a "Boostrapping" section.	2013-07-07 00:29:50 +02:00
emacs.texi	doc: Mention that guix.el works out-of-the-box on GSD.	2015-01-23 16:29:20 +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 'master' into core-updates	2015-04-17 09:54:11 -04:00