[Branch ~upstart-devel/upstart/trunk] Rev 1499: Merge lp:~jamesodhunt/upstart/bug-1197225

[noreply at launchpad.net]

Merge authors:
  James Hunt (jamesodhunt)
Related merge proposals:
  https://code.launchpad.net/~jamesodhunt/upstart/bug-1197225/+merge/172762
  proposed by: James Hunt (jamesodhunt)
------------------------------------------------------------
revno: 1499 [merge]
committer: Dmitrijs Ledkovs <dmitrijs.ledkovs at canonical.com>
branch nick: upstart
timestamp: Wed 2013-07-03 09:36:59 +0100
message:
  Merge lp:~jamesodhunt/upstart/bug-1197225
modified:
  ChangeLog
  extra/upstart-dbus-bridge.c
  extra/upstart-event-bridge.c
  extra/upstart-file-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: 3173 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/upstart-devel/attachments/20130703/f440aa40/attachment.diff>