[Branch ~upstart-devel/upstart/trunk] Rev 1660: Merge lp:~jamesodhunt/upstart/bug-1356824

[noreply at launchpad.net]

Merge authors:
  James Hunt (jamesodhunt)
Related merge proposals:
  https://code.launchpad.net/~jamesodhunt/upstart/bug-1356824/+merge/230777
  proposed by: James Hunt (jamesodhunt)
------------------------------------------------------------
revno: 1660 [merge]
committer: Dimitri John Ledkov <dimitri.ledkov at canonical.com>
branch nick: trunk
timestamp: Fri 2014-08-15 22:32:57 +0100
message:
  Merge lp:~jamesodhunt/upstart/bug-1356824
modified:
  ChangeLog
  init/control.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: 2259 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/upstart-devel/attachments/20140815/53966338/attachment.diff>