summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2014-06-11 20:29:55 +0200
committerVladimír Čunát <vcunat@gmail.com>2014-06-11 20:29:55 +0200
commite1775895a6974f79d047decaaa960acff43ac335 (patch)
tree3712bd85152ffb9ce80975eb59e5b848a2315067 /lib
parent751a01063dc9f40700e3774c3ee489f5fd1ee8ac (diff)
parent9ebb53c0e3b0bb391ff03cbc5a85ba80af494035 (diff)
Merge #2711: add ansible-1.6.1
Conflicts (trivial): lib/maintainers.nix
Diffstat (limited to 'lib')
-rw-r--r--lib/maintainers.nix1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index a0aae2f3b592..3a66f7a60b38 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -46,6 +46,7 @@
iElectric = "Domen Kozar <domen@dev.si>";
iyzsong = "Song Wenwu <iyzsong@gmail.com>";
jcumming = "Jack Cummings <jack@mudshark.org>";
+ joamaki = "Jussi Maki <joamaki@gmail.com>";
joelteon = "Joel Taylor <me@joelt.io>";
jwiegley = "John Wiegley <johnw@newartisans.com>";
kkallio = "Karn Kallio <tierpluspluslists@gmail.com>";