Merge branch 'master' into development
authorChris Koeritz <fred@gruntose.com>
Fri, 10 Nov 2017 15:22:47 +0000 (10:22 -0500)
committerChris Koeritz <fred@gruntose.com>
Fri, 10 Nov 2017 15:22:47 +0000 (10:22 -0500)
commit95841fc6ed58f9f24c1eaee8b81c2ce1d44969b9
tree1dc0bb478a31d742b017081385c2566474aa5b1d
parent7c44bf4a51ba0dcd3e95cb80655a91de3a84b4e5
parentf5d845d81352418af0785b85412a35888c82486f
Merge branch 'master' into development

sucking in things from master branch