Oliver Charles 42ae633445 Merge branch 'master' into dbus-switch-to-configuration ... Conflicts: nixos/modules/system/activation/switch-to-configuration.pl		2014-04-20 19:17:05 +01:00
..
config	Merge branch 'systemd-update'	2014-04-20 19:31:01 +02:00
hardware	mesa: have all output on /run/opengl-driver{,-32}	2014-04-14 21:38:23 +02:00
installer	nixos-rebuild: Handle $SHELL not being bash	2014-04-18 16:05:20 +02:00
misc	nixos: add spiped service module	2014-04-15 03:33:47 -05:00
profiles	no-x-libs.nix: Disable su xauth forwarding, and X11 dependency in dbus	2014-04-16 16:58:06 +02:00
programs	Set $LOCALE_ARCHIVE in all systemd units	2014-04-18 19:04:45 +02:00
security	Restart polkit if its configuration may have changed	2014-04-19 14:29:02 +02:00
services	Merge branch 'systemd-update'	2014-04-20 19:31:01 +02:00
system	Merge branch 'master' into dbus-switch-to-configuration	2014-04-20 19:17:05 +01:00
tasks	Containers: Use /etc/resolv.conf supplied by the host	2014-04-18 16:48:11 +02:00
testing	Fix the installer test	2014-04-20 01:56:11 +02:00
virtualisation	Enable udisks2 by default	2014-04-19 14:41:21 +02:00
module-list.nix	Merge pull request #2248 from ehmry/rsync	2014-04-18 10:17:08 -07:00
rename.nix	Remove redundant space	2014-04-18 14:59:59 +02:00