Merge branch 'master' of git://github.com/ocaml/opam-repository
Merge branch 'master' of git://github.com/ocaml/opam-repository
Merge branch 'master' of github.com:mirage/opam-repository
Merge branch 'master' of git://github.com/ocaml/opam-repository
omd 0.9.5 (The interface slightly changes!!)

- Omd_representation.Tag of extension becomes Omd_representation.Tag of name * extension (where name = string)
- documentation improvements for Omd_utils
- bug fix for lists that are followed by blank lines which contain spaces
Merge pull request #1613 from pw374/master

omd 0.9.5 (The interface slightly changes!!)
Merge pull request #1614 from vbmithr/master

Added ocamldsort-0.16.0, fix #360
Fix compilation of bin_prot under 32-bit ARM

This is the minimal diff to avoid changing the released code on
non-ARM.  See janestreet/bin_prot#4 where the upstream fix is
being discussed.
Merge pull request #1615 from mirage/fix-bin-prot-arm

Fix compilation of bin_prot under 32-bit ARM
Merge branch 'master' of github.com:mirage/opam-repository
added meta_conv.1.1.3 for ocaml 4.01.0
Merge pull request #1615 from mirage/fix-bin-prot-arm

Fix compilation of bin_prot under 32-bit ARM
Set ocaml version.
treeprint.1.0.2 can be compiled in 4.01.0
mustache templates in ocaml v 0.0.1
added virtual package "conf-sdl-net" for the C lib SDL_net 1.2
Merge pull request #1617 from rgrinberg/master

mustache templates in ocaml v 0.0.1
Update inotify url.
Move inotify from bitbucket to github.
put datalog doc in a proper subdir