Merge branch 'testing' into dev
authorChris Koeritz <fred@gruntose.com>
Sun, 12 Nov 2017 18:03:54 +0000 (13:03 -0500)
committerChris Koeritz <fred@gruntose.com>
Sun, 12 Nov 2017 18:03:54 +0000 (13:03 -0500)
commit736743815e2f1dbe74b161f87f7f1b09c29d3a40
tree22302a674042366f6972529b0ff2c2b29a786064
parent8f403891425dfe131948be97cae4edf21f3f7869
parentd39ffede53a1a9afde48bbd44af08394c48c04fe
Merge branch 'testing' into dev

merging testing branch inwards