[Branch ~upstart-devel/upstart/trunk] Rev 1454: Merge lp:~jamesodhunt/upstart/file-bridge-change-fpath-to-file-et-al

[noreply at launchpad.net]

Merge authors:
  James Hunt (jamesodhunt)
Related merge proposals:
  https://code.launchpad.net/~jamesodhunt/upstart/file-bridge-change-fpath-to-file-et-al/+merge/153603
  proposed by: James Hunt (jamesodhunt)
------------------------------------------------------------
revno: 1454 [merge]
committer: Steve Langasek <steve.langasek at canonical.com>
branch nick: upstream
timestamp: Tue 2013-03-19 01:08:54 -0700
message:
  Merge lp:~jamesodhunt/upstart/file-bridge-change-fpath-to-file-et-al
modified:
  extra/man/file-event.7
  extra/man/upstart-file-bridge.8
  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: 6795 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/upstart-devel/attachments/20130319/0d0d711e/attachment.diff>