Shea Levy 0c12dd3ded Merge branch 'pkgs/systemd/journald_http_gateway' of git://github.com/offlinehacker/nixpkgs ... systemd: python support & journal http gateway Conflicts: nixos/modules/misc/ids.nix		2014-03-14 19:16:59 -04:00
..
activation	switch-to-configuration: Don't try to start masked units	2014-03-12 18:52:11 +01:00
boot	Merge branch 'pkgs/systemd/journald_http_gateway' of git://github.com/offlinehacker/nixpkgs	2014-03-14 19:16:59 -04:00
etc	Make /etc/localtime a direct symlink to the zoneinfo file	2014-01-06 18:23:41 +01:00
upstart	Remove remaining references to Upstart	2013-10-31 13:26:06 +01:00