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	doc: Add example showing how to customize 'nscd-service'.	2015-04-12 22:34:47 +02:00
colord.scm	gnu: Add colord service.	2015-04-08 14:34:32 +02:00
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	services: lsh: Change #:initialize? to default to #t.	2015-04-03 22:58:49 +02:00
upower.scm	services: Add upower.	2015-04-13 00:02:59 +02:00
xorg.scm