[Branch ~upstart-devel/upstart/trunk] Rev 1542: Merge lp:~vorlon/upstart/lp.1235480

[noreply at launchpad.net]

Merge authors:
  Steve Langasek (vorlon)
Related merge proposals:
  https://code.launchpad.net/~vorlon/upstart/lp.1235480/+merge/189434
  proposed by: Steve Langasek (vorlon)
  review: Approve - Stéphane Graber (stgraber)
------------------------------------------------------------
revno: 1542 [merge]
committer: Steve Langasek <steve.langasek at canonical.com>
branch nick: upstream
timestamp: Fri 2013-10-04 14:50:13 -0700
message:
  Merge lp:~vorlon/upstart/lp.1235480
modified:
  ChangeLog
  extra/man/upstart-local-bridge.8
  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: 1752 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/upstart-devel/attachments/20131004/58f9d31c/attachment.diff>