Add package for Camlhighlight 3.0
Add merlin 1.7 release
Sync latest compiler pull requests
Merge pull request #2474 from Chris00/master

+ocamlnet.3.7.4-1
Merge pull request #2475 from bactrian/sync-prs-1408489201

Sync OCaml compiler PRs
Merge pull request #2473 from def-lkb/master

Add merlin 1.7 release
Use the upstream build system to compile dose
Merge branch 'master' of github.com:ocaml/opam-repository
Added websocket.0.9
Merge pull request #2477 from vbmithr/master

Added websocket.0.9
Merge pull request #2476 from samoht/dose3

Dose3
Fix compilation of dose3 on 4.02

Due to a change in ocamlbuild, the binaries do not compile anymore.
Merge pull request #2478 from samoht/dose3

Fix compilation of dose3 on 4.02
Add a profiling switch for 4.01
Merge branch 'master' of github.com:ocaml/opam-repository into prof
Merge pull request #2479 from samoht/prof

Profiling switch
Add debug information when profiling
Fix opam version in websocket
Merge pull request #2481 from samoht/prof

Add debug information when profiling
Merge pull request #2480 from samoht/websocket

Fix opam version in websocket