Merge branch 'master' of github.com:nixos/nixpkgs into add_pkg_gorilla

2016-12-29 14:02:52 +01:00
parent 004eceb0f6 774435d0aa
commit 87ef766f6b
24 changed files with 482 additions and 308 deletions
@@ -333,6 +333,7 @@
  ocharles = "Oliver Charles <ollie@ocharles.org.uk>";
  odi = "Oliver Dunkl <oliver.dunkl@gmail.com>";
  offline = "Jaka Hudoklin <jakahudoklin@gmail.com>";
+  oida = "oida <oida@posteo.de>";
  okasu = "Okasu <oka.sux@gmail.com>";
  olcai = "Erik Timan <dev@timan.info>";
  olejorgenb = "Ole Jørgen Brønner <olejorgenb@yahoo.no>";