The following commit has been merged in the master branch:
commit a24cdb7423aacebfd78e9ff35f39bf2c38fa519a
Merge: 9c0b1edabc7af1bb787e1d91020bdab566260d78
817cd1dc5e10d4ad85d05ee2f4eeb7a048d5a697
Author: Romain Beauxis <to...@rastageeks.org>
Date: Sat Jul 2 13:44:24 2011 -0500
Merge commit 'upstream/0.4.2'
Conflicts:
doc/html/Mad.html
doc/html/index_types.html
doc/html/index_values.html
doc/html/style.css
doc/html/type_Mad.html
--
ocaml-mad packaging
_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
