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
..
demo-os.scm	system: Change "en_US.UTF-8" to "en_US.utf8".	2014-11-29 11:37:53 +01:00
gnu-system.scm	Merge branch 'master' into core-updates	2015-04-17 09:54:11 -04:00
guix.scm	hydra: Add debugging for the Guix job set.	2014-01-18 14:41:58 +01:00