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
..
avahi.scm
base.scm
colord.scm
dbus.scm
dmd.scm
lirc.scm
networking.scm
ssh.scm
upower.scm
xorg.scm