]> git.ipfire.org Git - thirdparty/json-c.git/commitdiff
projects / thirdparty / json-c.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bc3e691 f3db59d)
Merge branch 'jobol-issue-165'
authorEric Haszlakiewicz <erh+git@nimenees.com>
Tue, 9 Aug 2016 11:38:18 +0000 (07:38 -0400)
committerEric Haszlakiewicz <erh+git@nimenees.com>
Tue, 9 Aug 2016 11:38:18 +0000 (07:38 -0400)

Trivial merge
Mirror of https://github.com/json-c/json-c.git