Merge branch 'master' into patch-1

This commit is contained in:
Song Gao 2017-09-27 11:52:14 -07:00 committed by GitHub
commit da407cd8ff
2 changed files with 2 additions and 1 deletions

View file

@ -6,4 +6,5 @@ daregod <daregod@yandex.ru>
Lucus Lee <lixin9311@gmail.com>
Arroyo Networks, LLC <open.source@arroyonetworks.com>
Tony Lu <tonyluj@gmail.com>
ajee cai <ajee.cai@gmail.com>
yinheli <hi@yinheli.com>