Merge branch 'master' of ssh://sunjammer.codewiz.org/~/wiki/git/wiki
authorBernie Innocenti <codewiz@google.com>
Thu, 27 Dec 2018 01:23:01 +0000 (10:23 +0900)
committerBernie Innocenti <codewiz@google.com>
Thu, 27 Dec 2018 01:23:01 +0000 (10:23 +0900)

Trivial merge