[Branch ~upstart-devel/upstart/trunk] Rev 1629: merge lp:~jamesodhunt/upstart/bug-1302117

[noreply at launchpad.net]

Merge authors:
  James Hunt (jamesodhunt)
Related merge proposals:
  https://code.launchpad.net/~jamesodhunt/upstart/bug-1302117/+merge/215173
  proposed by: James Hunt (jamesodhunt)
  review: Approve - Dimitri John Ledkov (xnox)
------------------------------------------------------------
revno: 1629 [merge]
committer: Dimitri John Ledkov <dimitri.ledkov at canonical.com>
branch nick: trunk
timestamp: Wed 2014-06-04 17:30:21 +0100
message:
  merge lp:~jamesodhunt/upstart/bug-1302117
modified:
  ChangeLog
  init/log.c
  util/tests/test_initctl.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: 3583 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/upstart-devel/attachments/20140604/088b4a98/attachment.diff>