[Branch ~upstart-devel/upstart/trunk] Rev 1630: merge lp:~jamesodhunt/upstart/bug-1315060

[noreply at launchpad.net]

Merge authors:
  James Hunt (jamesodhunt)
Related merge proposals:
  https://code.launchpad.net/~jamesodhunt/upstart/bug-1315060/+merge/218953
  proposed by: James Hunt (jamesodhunt)
------------------------------------------------------------
revno: 1630 [merge]
committer: Dimitri John Ledkov <dimitri.ledkov at canonical.com>
branch nick: trunk
timestamp: Wed 2014-06-04 17:55:28 +0100
message:
  merge lp:~jamesodhunt/upstart/bug-1315060
modified:
  ChangeLog
  init/main.c
  init/man/init.5
  init/man/init.8
  init/tests/test_main.c


--
lp:upstart
https://code.launchpad.net/~upstart-devel/upstart/trunk

Your team Upstart Reviewers is subscribed to branch lp:upstart.
To unsubscribe from this branch go to https://code.launchpad.net/~upstart-devel/upstart/trunk/+edit-subscription
-------------- next part --------------
A non-text attachment was scrubbed...
Name: revision-diff.txt
Type: text/x-diff
Size: 38506 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/upstart-devel/attachments/20140604/3fa67ff0/attachment-0001.diff>