Luca Bruno 6af0d6974f Merge branch 'master' into staging		2014-11-10 10:03:52 +01:00
..
activation	nixos-rebuild: reload dbus before starting other units. Closes #4546	2014-11-08 19:40:28 +01:00
boot
etc
upstart