summary refs log tree commit diff
path: root/lib
diff options
context:
space:
mode:
authorvbgl <vbgl@users.noreply.github.com>2015-05-26 23:52:32 +0200
committervbgl <vbgl@users.noreply.github.com>2015-05-26 23:52:32 +0200
commit2857d5d7a85659b289e3a49d807f89d2b5345715 (patch)
tree61d5c20ff90c73fe8c3784a313d5294c85fb2da7 /lib
parentf02284a36194619d4533b3349d4f67bc5cd54b19 (diff)
parentc651e7ff610b48a1f73a6db6da34e12174722bbd (diff)
downloadnixpkgs-2857d5d7a85659b289e3a49d807f89d2b5345715.tar
nixpkgs-2857d5d7a85659b289e3a49d807f89d2b5345715.tar.gz
nixpkgs-2857d5d7a85659b289e3a49d807f89d2b5345715.tar.bz2
nixpkgs-2857d5d7a85659b289e3a49d807f89d2b5345715.tar.lz
nixpkgs-2857d5d7a85659b289e3a49d807f89d2b5345715.tar.xz
nixpkgs-2857d5d7a85659b289e3a49d807f89d2b5345715.tar.zst
nixpkgs-2857d5d7a85659b289e3a49d807f89d2b5345715.zip
Merge pull request #7823 from ericbmerritt/ocaml-enhancements
Ocaml enhancements
Diffstat (limited to 'lib')
-rw-r--r--lib/maintainers.nix2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index bbd89c74eb7..ec3d6b84dd6 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -72,6 +72,7 @@
   eikek = "Eike Kettner <eike.kettner@posteo.de>";
   ellis = "Ellis Whitehead <nixos@ellisw.net>";
   emery = "Emery Hemingway <emery@vfemail.net>";
+  ericbmerritt = "Eric Merritt <eric@afiniate.com>";
   ertes = "Ertugrul Söylemez <ertesx@gmx.de>";
   exlevan = "Alexey Levan <exlevan@gmail.com>";
   falsifian = "James Cook <james.cook@utoronto.ca>";
@@ -112,6 +113,7 @@
   joelteon = "Joel Taylor <me@joelt.io>";
   jpbernardy = "Jean-Philippe Bernardy <jeanphilippe.bernardy@gmail.com>";
   jwiegley = "John Wiegley <johnw@newartisans.com>";
+  jwilberding = "Jordan Wilberding <jwilberding@afiniate.com>";
   jzellner = "Jeff Zellner <jeffz@eml.cc>";
   kkallio = "Karn Kallio <tierpluspluslists@gmail.com>";
   koral = "Koral <koral@mailoo.org>";