projects / platform / upstream / json-c.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1461b49 56166e2)
Merge branch 'master' of https://github.com/json-c/json-c
authorEric Haszlakiewicz <erh+git@nimenees.com>
Sun, 23 Dec 2012 16:59:52 +0000 (10:59 -0600)
committerEric Haszlakiewicz <erh+git@nimenees.com>
Sun, 23 Dec 2012 16:59:52 +0000 (10:59 -0600)

Trivial merge
Domain: System / Base;