Merge master into staging-next

2019-01-04 21:13:19 +01:00
parent 030f66400d 1a7d28e31f
commit 9618abe87c
99 changed files with 3758 additions and 2213 deletions
@@ -1750,6 +1750,11 @@
    github = "hamhut1066";
    name = "Hamish Hutchings";
  };
+  hansjoergschurr = {
+    email = "commits@schurr.at";
+    github = "hansjoergschurr";
+    name = "Hans-Jörg Schurr";
+  };
  haslersn = {
    email = "haslersn@fius.informatik.uni-stuttgart.de";
    github = "haslersn";
@@ -3911,6 +3916,10 @@
    github = "fkz";
    name = "Fabian Schmitthenner";
  };
+  schmittlauch = {
+    email = "t.schmittlauch+nixos@orlives.de";
+    github = "schmittlauch";
+  };
  schneefux = {
    email = "schneefux+nixos_pkg@schneefux.xyz";
    github = "schneefux";