Merge branch 'master' of /home/elanthis/Source/janssonxx
authorSean Middleditch <sean@middleditch.us>
Tue, 19 Jan 2010 05:26:10 +0000 (21:26 -0800)
committerSean Middleditch <sean@middleditch.us>
Tue, 19 Jan 2010 05:26:10 +0000 (21:26 -0800)
commit2ad4634de51bd06c03d1ba5831247ed865c03506
tree8b87afbc796483d3524ce5e357b45dbc3edc8761
parentb077d7988e2ec55e09df35e3c0383a86adf807da
parente0806677296e1d223adb02f0cbf0a03837bf893b
Merge branch 'master' of /home/elanthis/Source/janssonxx

Conflicts:
.gitignore
src/jansson-impl.hpp
src/jansson.hpp
test/suites/api/test.json
test/suites/api/test_cpp.cpp