[Branch ~upstart-devel/upstart/trunk] Rev 1632: merge lp:~jamesodhunt/upstart/bug-1324096

[noreply at launchpad.net]

Merge authors:
  Dimitri John Ledkov (xnox)
  James Hunt (jamesodhunt)
Related merge proposals:
  https://code.launchpad.net/~jamesodhunt/upstart/bug-1324096/+merge/221743
  proposed by: James Hunt (jamesodhunt)
------------------------------------------------------------
revno: 1632 [merge]
committer: Dimitri John Ledkov <dimitri.ledkov at canonical.com>
branch nick: trunk
timestamp: Thu 2014-06-05 11:13:51 +0100
message:
  merge lp:~jamesodhunt/upstart/bug-1324096
modified:
  ChangeLog
  dbus/com.ubuntu.Upstart.xml
  init/control.c
  init/control.h
  util/initctl.c
  util/man/initctl.8
  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: 42995 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/upstart-devel/attachments/20140605/17b04ad9/attachment-0001.diff>