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
emacs.texi
fdl-1.3.texi
guix.texi	Merge branch 'master' into core-updates	2015-04-17 09:54:11 -04:00