Merge branch 'master' of https://github.com/json-c/json-c
authorEric Haszlakiewicz <erh+git@nimenees.com>
Mon, 1 Apr 2013 01:58:54 +0000 (20:58 -0500)
committerEric Haszlakiewicz <erh+git@nimenees.com>
Mon, 1 Apr 2013 01:58:54 +0000 (20:58 -0500)

Trivial merge