[Branch ~upstart-devel/upstart/trunk] Rev 1591: * Merge of lp:~jamesodhunt/upstart/bug-1269731.

[noreply at launchpad.net]

Merge authors:
  James Hunt (jamesodhunt)
Related merge proposals:
  https://code.launchpad.net/~jamesodhunt/upstart/bug-1269731/+merge/202083
  proposed by: James Hunt (jamesodhunt)
  review: Approve - Colin Watson (cjwatson)
------------------------------------------------------------
revno: 1591 [merge]
committer: James Hunt <james.hunt at ubuntu.com>
branch nick: upstart
timestamp: Tue 2014-01-21 10:36:24 +0000
message:
  * Merge of lp:~jamesodhunt/upstart/bug-1269731.
modified:
  ChangeLog
  init/conf.c
  init/job_class.c
  init/tests/test_conf.c
  scripts/pyupstart.py
  scripts/tests/test_pyupstart_session_init.py
  scripts/tests/test_pyupstart_system_init.py


--
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: 9887 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/upstart-devel/attachments/20140121/61d5bb80/attachment-0001.diff>