diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-11-14 12:39:32 -0800 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-11-14 12:39:32 -0800 |
| commit | 453f7c7218dfb5788f91f9cecae4a4d3cf650af6 (patch) | |
| tree | bd3f745c9487b6e8d786fc80b5ab5066c0360cb3 /lib/maintainers.nix | |
| parent | fc8562c78590f269d9bf35f64ec21bdc5b3612c5 (diff) | |
| parent | 6e18a33183006514021f63baebb78a502bdff8aa (diff) | |
| download | nixlib-453f7c7218dfb5788f91f9cecae4a4d3cf650af6.tar nixlib-453f7c7218dfb5788f91f9cecae4a4d3cf650af6.tar.gz nixlib-453f7c7218dfb5788f91f9cecae4a4d3cf650af6.tar.bz2 nixlib-453f7c7218dfb5788f91f9cecae4a4d3cf650af6.tar.lz nixlib-453f7c7218dfb5788f91f9cecae4a4d3cf650af6.tar.xz nixlib-453f7c7218dfb5788f91f9cecae4a4d3cf650af6.tar.zst nixlib-453f7c7218dfb5788f91f9cecae4a4d3cf650af6.zip | |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'lib/maintainers.nix')
| -rw-r--r-- | lib/maintainers.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 0ec329e6afb0..14a7de594aa2 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -150,6 +150,7 @@ jwilberding = "Jordan Wilberding <jwilberding@afiniate.com>"; jzellner = "Jeff Zellner <jeffz@eml.cc>"; kamilchm = "Kamil Chmielewski <kamil.chm@gmail.com>"; + kampfschlaefer = "Arnold Krille <arnold@arnoldarts.de>"; khumba = "Bryan Gardiner <bog@khumba.net>"; kkallio = "Karn Kallio <tierpluspluslists@gmail.com>"; koral = "Koral <koral@mailoo.org>"; @@ -188,6 +189,7 @@ meditans = "Carlo Nucera <meditans@gmail.com>"; meisternu = "Matt Miemiec <meister@krutt.org>"; michelk = "Michel Kuhlmann <michel@kuhlmanns.info>"; + michaelpj = "Michael Peyton Jones <michaelpj@gmail.com>"; mirdhyn = "Merlin Gaillard <mirdhyn@gmail.com>"; mschristiansen = "Mikkel Christiansen <mikkel@rheosystems.com>"; modulistic = "Pablo Costa <modulistic@gmail.com>"; |