[Branch ~upstart-devel/upstart/trunk] Rev 1423: Merge of lp:~xnox/upstart/overrides.

[noreply at launchpad.net]

Merge authors:
  Dmitrijs Ledkovs (xnox)
Related merge proposals:
  https://code.launchpad.net/~xnox/upstart/overrides/+merge/141914
  proposed by: Dmitrijs Ledkovs (xnox)
  review: Approve - James Hunt (jamesodhunt)
------------------------------------------------------------
revno: 1423 [merge]
committer: James Hunt <james.hunt at ubuntu.com>
branch nick: upstart
timestamp: Tue 2013-01-08 16:28:57 +0000
message:
  Merge of lp:~xnox/upstart/overrides.
modified:
  ChangeLog
  init/conf.c
  init/tests/test_conf.c
  init/tests/test_conf_static.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: 21696 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/upstart-devel/attachments/20130108/ccd5e816/attachment.diff>