Eelco Dolstra 44d091674b Merge branch 'master' of github.com:NixOS/nixos into systemd ... Conflicts: modules/config/networking.nix modules/services/networking/ssh/sshd.nix modules/services/ttys/agetty.nix modules/system/boot/stage-2-init.sh modules/system/upstart-events/shutdown.nix		2012-07-16 17:27:11 -04:00
..
default.nix	Merge branch 'master' of github.com:NixOS/nixos into systemd	2012-07-16 17:27:11 -04:00
mediawiki.nix	MediaWiki: Generalise the skins support	2012-07-05 21:04:23 +02:00
mercurial.nix	* Use the ‘path’ attribute in Upstart jobs in more places. It's a bit	2011-11-25 16:32:54 +00:00
per-server-options.nix	* Move logFormat to the per-vhost options.	2012-05-11 23:14:05 +00:00
tomcat-connector.nix	Added extraWorkersProperties parameter, so that custom tweaks can be added	2012-02-06 13:11:48 +00:00
trac.nix	strip trailing whitespace; no functional change	2011-09-14 18:20:50 +00:00
zabbix.nix	* Use the ‘path’ attribute in Upstart jobs in more places. It's a bit	2011-11-25 16:32:54 +00:00