Merge branch master into rorczrorcz
commita3661deadaa48799f0a4bb0b08ed3f934727d025
authorKyle J. McKay <mackyle@gmail.com>
Thu, 7 Dec 2017 21:36:38 +0000 (7 13:36 -0800)
committerKyle J. McKay <mackyle@gmail.com>
Thu, 7 Dec 2017 21:36:38 +0000 (7 13:36 -0800)
tree46d15c21c0d1d22df3c7d6a300479f3594101578
parent1fd8ef47069ed0db19ebb248b1c27a63aa578fef
parentff48c506e1033fba2ef96a9d7872ab474b1ffb37
Merge branch master into rorcz