Viewing all changes in revision 1296.

Committer: James Hunt
Date: 2011-06-01 14:37:18 UTC
mfrom: <a title="Merged From 1295.1.1" href="/~jamesodhunt/upstart/foo/revision/1295.1.1">(1295.1.1 upstream-add-initctl2dot)
Revision ID: james.hunt@ubuntu.com-20110601143718-6rj9y2fc7jb2zdjf

Merge of lp:~jamesodhunt/upstart/upstream-add-initctl2dot.

added added

removed removed