Merge branch 'release-2.140.92' 2.140.92
authorChris Koeritz <fred@gruntose.com>
Fri, 10 Nov 2017 22:49:18 +0000 (17:49 -0500)
committerChris Koeritz <fred@gruntose.com>
Fri, 10 Nov 2017 22:49:18 +0000 (17:49 -0500)
commit62713f7e66818d0121655795a840ec4c907a6225
treefd206f86ada90cd8cf4933ceb3ff363af10d1a79
parente4d756298fb49803f04ff8f246892b5cfd317944
parent668c41b51990bc1b1a862ed09a33ac6f9cd16084
Merge branch 'release-2.140.92'

bringing in release code for 2.140.92.
this marks a fairly painful learning process for git branches, but it seems like things have stabilized now.