Merge branch 'master.upstream' into staging.upstream

2015-11-05 18:30:11 -08:00
parent 974dd8012d ddbb174bb0
commit 1e7aa4f17d
23 changed files with 125 additions and 105 deletions
@@ -190,6 +190,7 @@
  mirdhyn = "Merlin Gaillard <mirdhyn@gmail.com>";
  mschristiansen = "Mikkel Christiansen <mikkel@rheosystems.com>";
  modulistic = "Pablo Costa <modulistic@gmail.com>";
+  mog = "Matthew O'Gorman <mog-lists@rldn.net>";
  mornfall = "Petr Ročkai <me@mornfall.net>";
  MP2E = "Cray Elliott <MP2E@archlinux.us>";
  msackman = "Matthew Sackman <matthew@wellquite.org>";