~xnox/upstart/fix-1234841

Viewing all changes in revision 1555.

  • Committer: Dmitrijs Ledkovs
  • Date: 2013-11-05 16:15:19 UTC
  • mfrom: (1533.2.3 upstart-no-system-bus)
  • Revision ID: dmitrijs.ledkovs@canonical.com-20131105161519-o802ltn8zo3qer88
merge lp:~jamesodhunt/upstart/disable-system-bus with conflicts resolved

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: