Milo Yip 7f9921fc60 Merge branch 'master' into schema
# Conflicts:
#	.gitignore
#	include/rapidjson/internal/stack.h
2016-01-26 15:24:04 +08:00
..