Use the OASIS alpha feature: compiled_setup_ml
Update against oasis dev (fix a bug in configure)
Oasis: fix optional dependency on type_conv
Merge branch 'branch-0.6'

Conflicts:
	_oasis
Various improvements of the _oasis
Remove some no more generated files from the .gitignore
Fix a typo in _oasis
Fix Makefile.dist
Merge branch 'branch-0.6'
Merge remote-tracking branch 'origin/oasis.0.4.4' into HEAD
Use the OASIS alpha feature: compiled_setup_ml
Improve the opam file and fix the version
Opam fix
Introduce .jenkins.sh
jenkins: do not hide build log
Merge pull request #26 from ocsigen/jenkins

Jenkins now builds PR
Update .jenkins.sh
Update .jenkins.sh (bis)
Merge remote-tracking branch 'upstream/master'

Conflicts:
	_oasis