Merge branch 'release-2.140.103' 2.140.103
authorChris Koeritz <fred@gruntose.com>
Tue, 21 Nov 2017 05:26:59 +0000 (00:26 -0500)
committerChris Koeritz <fred@gruntose.com>
Tue, 21 Nov 2017 05:26:59 +0000 (00:26 -0500)
bringing in updated docs and much improved version files approach in c++


Trivial merge