Eelco Dolstra 06fc1ec34d Merge remote-tracking branch 'origin/master' into staging ... Conflicts: pkgs/servers/serfdom/default.nix		2014-07-01 11:25:41 +02:00
..
camlidl
camlp5
cppo	Adds cppo	2014-06-25 10:25:14 +02:00
deriving	Another attempt to eradicate ensureDir	2014-06-30 14:56:10 +02:00
findlib	Updated OCaml package findlib	2014-04-21 23:06:35 +02:00
oasis
ocamlify
ocamlmod
omake
opam