[Branch ~upstart-devel/upstart/trunk] Rev 1666: Merge lp:~jamesodhunt/upstart/bug-1447756-the-actual-fix

[noreply at launchpad.net]

Merge authors:
  James Hunt (jamesodhunt)
Related merge proposals:
  https://code.launchpad.net/~jamesodhunt/upstart/bug-1447756-the-actual-fix/+merge/259020
  proposed by: James Hunt (jamesodhunt)
------------------------------------------------------------
revno: 1666 [merge]
committer: Steve Langasek <steve.langasek at canonical.com>
branch nick: upstream
timestamp: Thu 2015-05-14 10:30:42 -0700
message:
  Merge lp:~jamesodhunt/upstart/bug-1447756-the-actual-fix
modified:
  ChangeLog
  init/log.c
  init/tests/test_log.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: 6570 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/upstart-devel/attachments/20150514/8896b659/attachment.diff>