merge
authorWilliam Deegan <bill@baddogconsulting.com>
Mon, 21 Aug 2017 23:12:03 +0000 (16:12 -0700)
committerWilliam Deegan <bill@baddogconsulting.com>
Mon, 21 Aug 2017 23:12:03 +0000 (16:12 -0700)
1  2 
doc/generated/variables.gen

Simple merge