Shea Levy 2a4282c811 Revert "Merge branch 'dbus-switch-to-configuration'" ... This seems to have combined badly with the systemd upgrade, we'll revert for now and revisit after the 14.04 branch. This reverts commit ad80532881, reversing changes made to 1c5d3c7883.		2014-04-21 18:30:05 -04:00
..
activation	Revert "Merge branch 'dbus-switch-to-configuration'"	2014-04-21 18:30:05 -04:00
boot	Merge branch 'modulesfix' of git://github.com/kirelagin/nixpkgs	2014-04-21 07:51:31 -04:00
etc	Rewrite ‘with pkgs.lib’ -> ‘with lib’	2014-04-14 16:26:48 +02:00
upstart	upstart: Oneshot rules should always have Restart=no	2014-04-16 01:04:52 +02:00