Merge master into staging-next

2018-12-31 12:00:36 +01:00
parent ec1f78d1cb 42575040fc
commit 070290bda7
172 changed files with 2734 additions and 2541 deletions
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4677,6 +4677,11 @@
    github = "vklquevs";
    name = "vklquevs";
  };
+  vlaci = {
+    email = "laszlo.vasko@outlook.com";
+    github = "vlaci";
+    name = "László Vaskó";
+  };
  vlstill = {
    email = "xstill@fi.muni.cz";
    github = "vlstill";