Viewing all changes in revision 1456.1.18.

Committer: James Hunt
Date: 2013-08-15 13:37:43 UTC
mfrom: <a title="Merged From 1510.1.7" href="/~xnox/upstart/reload-signal/revision/1510.1.7">(1510.1.7 upstart)
mto: <a title="Merged In 1510.1.9" href="/~xnox/upstart/reload-signal/revision/1510.1.9">(1510.1.9 upstart)
mto: This revision was merged to the branch mainline in revision 1517 .
Revision ID: james.hunt@ubuntu.com-20130815133743-v6iq6whxd5xh5j2v

* Sync with lp:upstart taking care to set extra/Makefile.am's EXTRA_DIST
correctly.

added added

removed removed