Eelco Dolstra 3ad370ae0a Merge remote-tracking branch 'origin/master' into systemd
Conflicts:
	modules/misc/ids.nix
	modules/services/mail/postfix.nix
	modules/services/system/nscd.nix
	modules/services/x11/desktop-managers/xfce.nix
	modules/system/boot/stage-1.nix
2012-09-28 11:35:27 -04:00
..
2012-08-20 11:21:03 -04:00
2012-02-20 16:53:44 +00:00
2011-11-10 23:06:24 +00:00
2012-08-30 21:11:36 -04:00
2011-10-31 12:48:59 +00:00
2011-11-03 18:49:54 +00:00
2012-08-17 11:02:12 -04:00
2012-04-19 08:28:54 +00:00