Merge master into staging-next

2019-01-02 21:08:27 +01:00
parent 070290bda7 82f679c269
commit 092e3b50a8
97 changed files with 1187 additions and 858 deletions
@@ -391,6 +391,11 @@
    github = "asppsa";
    name = "Alastair Pharo";
  };
+  astro = {
+    email = "astro@spaceboyz.net";
+    github = "astro";
+    name = "Astro";
+  };
  astsmtl = {
    email = "astsmtl@yandex.ru";
    github = "astsmtl";