Merge #2711: add ansible-1.6.1

Conflicts (trivial): lib/maintainers.nix
2014-06-11 20:29:55 +02:00
parent 751a01063d 9ebb53c0e3
commit e1775895a6
4 changed files with 41 additions and 2 deletions
--- 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>";