[Merge] lp:~jamesodhunt/upstart/bug-1315060 into lp:upstart

[James Hunt]

James Hunt has proposed merging lp:~jamesodhunt/upstart/bug-1315060 into lp:upstart.

Requested reviews:
  Upstart Reviewers (upstart-reviewers)
Related bugs:
  Bug #1315060 in upstart (Ubuntu): "Allow --confdir to look for system jobs in more than one directory"
  https://bugs.launchpad.net/ubuntu/+source/upstart/+bug/1315060

For more details, see:
https://code.launchpad.net/~jamesodhunt/upstart/bug-1315060/+merge/218953
-- 
https://code.launchpad.net/~jamesodhunt/upstart/bug-1315060/+merge/218953
Your team Upstart Reviewers is requested to review the proposed merge of lp:~jamesodhunt/upstart/bug-1315060 into lp:upstart.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 24658 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/upstart-devel/attachments/20140509/10f87b43/attachment.diff>