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
..
apache-httpd	Merge branch 'master' of github.com:NixOS/nixos into systemd	2012-07-16 17:27:11 -04:00
jboss	Reverting revisions 30103-30106: "always set nixpkgs.config.{state,store}Dir", etc.	2011-10-30 15:19:58 +00:00
tomcat.nix	Removed some tabs	2012-02-06 14:04:15 +00:00