Merge 'staging' into closure-size

This is mainly to get the update of bootstrap tools. Otherwise there were mysterious segfaults: https://github.com/NixOS/nixpkgs/pull/7701#issuecomment-203389817
2016-04-07 14:40:51 +02:00
parent 056b5a1a5f c55cfe0cb3
commit d1df28f8e5
89 changed files with 1475 additions and 397 deletions
@@ -51,6 +51,7 @@
  bdimcheff = "Brandon Dimcheff <brandon@dimcheff.com>";
  benley = "Benjamin Staffin <benley@gmail.com>";
  bennofs = "Benno Fünfstück <benno.fuenfstueck@gmail.com>";
+  benwbooth = "Ben Booth <benwbooth@gmail.com>";
  berdario = "Dario Bertini <berdario@gmail.com>";
  bergey = "Daniel Bergey <bergey@teallabs.org>";
  bjg = "Brian Gough <bjg@gnu.org>";