Merge remote-tracking branch 'origin/master' into staging

This commit is contained in:
Eelco Dolstra
2014-09-18 22:28:35 +02:00
340 changed files with 5242 additions and 1514 deletions
+1 -1
View File
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
doCheck = false;
meta = {
maintainers = stdenv.lib.maintainers.orbitz;
maintainers = [ stdenv.lib.maintainers.orbitz ];
description = "A package manager for OCaml";
platforms = stdenv.lib.platforms.all;
};