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)
commit29436911814d006eb7d713ad72e5c0d936f441f3
treef927cc4d4e6616e889777330ff3099af01bb9d7d
parent1461b49385c6aa86e8426f91e8d608cb83bad241
parent56166e2dff56e2c7dff6d2085587dc8da3c48ebe
Merge branch 'master' of https://github.com/json-c/json-c