Merge branch 'master' into staging

2017-07-03 09:48:58 +02:00
parent 343ad1697d 0b1c8793fc
commit d1a89ae9d7
124 changed files with 4698 additions and 3339 deletions
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -530,6 +530,7 @@
  steveej = "Stefan Junker <mail@stefanjunker.de>";
  SuprDewd = "Bjarki Ágúst Guðmundsson <suprdewd@gmail.com>";
  swarren83 = "Shawn Warren <shawn.w.warren@gmail.com>";
+  swflint = "Samuel W. Flint <swflint@flintfam.org>";
  swistak35 = "Rafał Łasocha <me@swistak35.com>";
  szczyp = "Szczyp <qb@szczyp.com>";
  sztupi = "Attila Sztupak <attila.sztupak@gmail.com>";