[Branch ~upstart-devel/upstart/trunk] Rev 1667: Merge lp:~xnox/upstart/lp1433013

[noreply at launchpad.net]

Merge authors:
  Dimitri John Ledkov (xnox)
Related merge proposals:
  https://code.launchpad.net/~xnox/upstart/lp1433013/+merge/259317
  proposed by: Dimitri John Ledkov (xnox)
  review: Approve - Marco Trevisan (Treviño) (3v1n0)
------------------------------------------------------------
revno: 1667 [merge]
committer: Steve Langasek <steve.langasek at canonical.com>
branch nick: upstream
timestamp: Fri 2016-04-29 14:18:24 -0700
message:
  Merge lp:~xnox/upstart/lp1433013
added:
  dbus/org.freedesktop.DBus.xml
modified:
  dbus/Makefile.am
  init/Makefile.am
  init/control.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: 9723 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/upstart-devel/attachments/20160429/05725319/attachment.diff>