Merge branch 'pr' of https://github.com/camlspotter/opam-repository into pr
Merge remote-tracking branch 'upstream/master' into pr
Merge branch 'pr' of https://github.com/camlspotter/opam-repository into pr
Merge remote-tracking branch 'upstream/master' into pr
added ocamltter.2.0.1
Merge remote-tracking branch 'upstream/master' into pr
OMyMakefile change without version increment
Merge remote-tracking branch 'upstream/master' into pr
ocamlspot bug fix + droping support of 4.00.0
Add lpd 1.2
Merge pull request #615 from olgu/ibx

Update ibx descr
Merge pull request #614 from Chris00/master

lpd 1.2
Add rope 0.5
re 1.2.1
Merge pull request #617 from mirage/master

re 1.2.1
Merge pull request #616 from Chris00/master

Add rope 0.5
Add "conflicts:" where needed.
Merge remote-tracking branch 'origin/master'
Update milter 1.0.0 using oasis2opam.

The maintainer's email was changed by hand because no email is present
in the _oasis file.
Remove the conflict spf ↔ milter (milter fixed).