# Conflicts:
#	README.md
#	package.json
#	src/addons/build.js
#	src/addons/matchrecursive.js
#	src/addons/unicode-base.js
#	src/xregexp.js