[Branch ~upstart-devel/upstart/trunk] Rev 1541: merge lp:~jamesodhunt/upstart/bug-1234898

[noreply at launchpad.net]

Merge authors:
  James Hunt (jamesodhunt)
Related merge proposals:
  https://code.launchpad.net/~jamesodhunt/upstart/bug-1234898/+merge/189296
  proposed by: James Hunt (jamesodhunt)
  review: Approve - Dmitrijs Ledkovs (xnox)
------------------------------------------------------------
revno: 1541 [merge]
committer: Dmitrijs Ledkovs <dmitrijs.ledkovs at canonical.com>
branch nick: upstart
timestamp: Fri 2013-10-04 15:22:39 +0100
message:
  merge lp:~jamesodhunt/upstart/bug-1234898
modified:
  ChangeLog
  extra/upstart-local-bridge.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: 7174 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/upstart-devel/attachments/20131004/242953c0/attachment-0001.diff>