Merge branch master into rorcz
commit0188272a3bd29fcdc1b8021869b9969794181831
authorKyle J. McKay <mackyle@gmail.com>
Wed, 14 Feb 2018 10:39:21 +0000 (14 02:39 -0800)
committerKyle J. McKay <mackyle@gmail.com>
Wed, 14 Feb 2018 10:39:21 +0000 (14 02:39 -0800)
tree17d2ffa22bc05045d4671327cd26e5456502c57a
parent011a43e288292cec3f1689e3875b27d21a6ee478
parentc0dcf5ea4eeac7dbf5dd5c3a1447e74e75bbcf3f
Merge branch master into rorcz
cron/girocco