Merge branch 'release-2.140.96' into dev
authorChris Koeritz <fred@gruntose.com>
Sat, 11 Nov 2017 13:29:48 +0000 (08:29 -0500)
committerChris Koeritz <fred@gruntose.com>
Sat, 11 Nov 2017 13:29:48 +0000 (08:29 -0500)
commit8915a7554c073a647b9f2579920e3b8e2d971b0a
treea686c1b7d09baf7454af64d7709c0d020bf48255
parentdfb61170276cb54900073208d1b843acad51ea04
parent5aa569cd006505773d954b714f6f60f408f66e14
Merge branch 'release-2.140.96' into dev

bringing in that crucial fix, finally.  only needed to wake up at 6am on saturday to get it going.