[Branch ~upstart-devel/upstart/trunk] Rev 1546: Merge lp:~xnox/upstart/fix-socket-bridge-path

[noreply at launchpad.net]

Merge authors:
  Dmitrijs Ledkovs (xnox)
------------------------------------------------------------
revno: 1546 [merge]
committer: Steve Langasek <steve.langasek at canonical.com>
branch nick: upstream
timestamp: Wed 2013-10-23 15:44:54 -0700
message:
  Merge lp:~xnox/upstart/fix-socket-bridge-path
modified:
  ChangeLog
  extra/man/socket-event.7
  extra/upstart-socket-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: 1199 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/upstart-devel/attachments/20131023/471ac4ac/attachment.diff>