Merge recent master into staging

Hydra nixpkgs: ?compare=1151601
2014-09-13 21:48:29 +02:00
parent 6a63d1e1e1
commit d957b4bd78
138 changed files with 9311 additions and 7047 deletions
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
  prefixKey = "--prefix ";

  meta = {
-    description = "An editor-independant tool to ease the developpement of programs in OCaml";
+    description = "An editor-independent tool to ease the development of programs in OCaml";
    homepage = "http://the-lambda-church.github.io/merlin/";
    license = stdenv.lib.licenses.mit;
  };