[Branch ~upstart-devel/upstart/trunk] Rev 1506: Merge lp:~cjwatson/upstart/new-json-c

[noreply at launchpad.net]

Merge authors:
  Colin Watson (cjwatson)
Related merge proposals:
  https://code.launchpad.net/~cjwatson/upstart/new-json-c/+merge/174952
  proposed by: Colin Watson (cjwatson)
------------------------------------------------------------
revno: 1506 [merge]
committer: Dmitrijs Ledkovs <dmitrijs.ledkovs at canonical.com>
branch nick: upstart
timestamp: Tue 2013-07-16 10:38:15 +0100
message:
  Merge lp:~cjwatson/upstart/new-json-c
modified:
  ChangeLog
  configure.ac


--
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: 747 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/upstart-devel/attachments/20130716/ef409683/attachment-0001.diff>