[Branch ~upstart-devel/upstart/trunk] Rev 1411: Sync with lp:upstart.

[noreply at launchpad.net]

Merge authors:
  Dmitrijs Ledkovs (xnox)
  James Hunt (jamesodhunt)
  Steve Langasek (vorlon)
  Stéphane Graber (stgraber)
Related merge proposals:
  https://code.launchpad.net/~xnox/upstart/ignore/+merge/141360
  proposed by: Dmitrijs Ledkovs (xnox)
  https://code.launchpad.net/~stgraber/upstart/upstart-events-bridge/+merge/140693
  proposed by: Stéphane Graber (stgraber)
  review: Approve - James Hunt (jamesodhunt)
------------------------------------------------------------
revno: 1411 [merge]
committer: James Hunt <james.hunt at ubuntu.com>
branch nick: upstart-setenv+getenv
timestamp: Tue 2013-01-08 15:59:35 +0000
message:
  Sync with lp:upstart.
added:
  extra/conf/upstart-event-bridge.conf
  extra/man/upstart-event-bridge.8
  extra/upstart-event-bridge.c
modified:
  .bzrignore
  extra/Makefile.am


--
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: 11523 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/upstart-devel/attachments/20130131/d4018e90/attachment-0001.diff>