diff options
author | William A. Kennington III <william@wkennington.com> | 2015-11-13 15:53:10 -0800 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2015-11-13 15:53:10 -0800 |
commit | 9579c9ec7f53be31efba3803bd86661b59b0bb81 (patch) | |
tree | e9e9ec19c0989f18d96ec0b8c6faf3780eb3dfb1 /lib | |
parent | 83aeb00a78ebca04bd6a42721284cad87da9fabe (diff) | |
parent | cb21b77ff1b9ed006d1180ad7c94b2ee7ed3c096 (diff) | |
download | nixlib-9579c9ec7f53be31efba3803bd86661b59b0bb81.tar nixlib-9579c9ec7f53be31efba3803bd86661b59b0bb81.tar.gz nixlib-9579c9ec7f53be31efba3803bd86661b59b0bb81.tar.bz2 nixlib-9579c9ec7f53be31efba3803bd86661b59b0bb81.tar.lz nixlib-9579c9ec7f53be31efba3803bd86661b59b0bb81.tar.xz nixlib-9579c9ec7f53be31efba3803bd86661b59b0bb81.tar.zst nixlib-9579c9ec7f53be31efba3803bd86661b59b0bb81.zip |
Merge commit 'cb21b77' into master.upstream
This is a partial merge of staging for builds which are working
Diffstat (limited to 'lib')
-rw-r--r-- | lib/maintainers.nix | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 14a7de594aa2..0ec329e6afb0 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -150,7 +150,6 @@ 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>"; @@ -189,7 +188,6 @@ 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>"; |