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	services: Explicitly refer to Shadow when requiring the 'nologin' shell.	2015-04-17 13:53:16 +02:00
base.scm
colord.scm
dbus.scm	services: Explicitly refer to Shadow when requiring the 'nologin' shell.	2015-04-17 13:53:16 +02:00
dmd.scm
lirc.scm
networking.scm	services: Explicitly refer to Shadow when requiring the 'nologin' shell.	2015-04-17 13:53:16 +02:00
ssh.scm
upower.scm
xorg.scm