Merge pull request #4 from avsm/master

add sexp representation
Merge pull request #5 from avsm/master

release 1.4.0
bump to 0.4.1 and sync CHANGES and add @rgrinberg to authors

No need for major version bump since the Re change is internal only
release 0.4.1
Remove `Uri_IP` and `Uri_re` modules as being obsolete now.

IP parsing should be done via the `ipaddr` library instead, and
the regular expressions in `Uri_re` were never completed.
Revert "Remove `Uri_IP` and `Uri_re` modules as being obsolete now."

This reverts commit 11124c6d74622f692f7c8bf7b5f075d702834622.  This was meant to go into a branch, not into master...
Note merlin addition
Merge pull request #6 from avsm/master

release 1.4.1
bump version to 1.5.0, since the Re_str dependency removal can break upstream package links
Merge pull request #7 from avsm/master

bump version to 1.5.0, since the Re_str dependency removal can break ups...
travis: use mirage-repo to test new packages
Travis: fix 3.12.1 build since mirage not available there
Remove `Uri_IP` module, superseded by the `ipaddr` package
Remove *.syntax in META file
Merge pull request #38 from avsm/remove-uri_ip

Remove `Uri_IP` module, superseded by the `ipaddr` package
Merge branch 'master' of git://github.com/dinosaure/ocaml-uri

Conflicts:
	lib/META
	setup.ml
sync autogen and CHANGES
Expose `Uri.with_scheme` function to modify scheme

Closes #40
Add `with_userinfo` functional setter
Merge pull request #41 from avsm/master

add with_scheme and with_userinfo functional setters