[Branch ~upstart-devel/upstart/trunk] Rev 1549: merge lp:~jamesodhunt/upstart/bug-1221466+1222702

[noreply at launchpad.net]

Merge authors:
  James Hunt (jamesodhunt)
Related merge proposals:
  https://code.launchpad.net/~jamesodhunt/upstart/bug-1221466+1222702/+merge/184829
  proposed by: James Hunt (jamesodhunt)
------------------------------------------------------------
revno: 1549 [merge]
committer: Dmitrijs Ledkovs <dmitrijs.ledkovs at canonical.com>
branch nick: upstart
timestamp: Sun 2013-11-03 00:19:02 +0000
message:
  merge lp:~jamesodhunt/upstart/bug-1221466+1222702
modified:
  ChangeLog
  extra/upstart-file-bridge.c
  scripts/tests/test_pyupstart_session_init.py


--
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: 12199 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/upstart-devel/attachments/20131103/969d8a05/attachment-0001.diff>