Merge branch 'jhaley' into jm2/detect2
commitfc09b91c0362a74f4ab65cf6090eb395544db94b
authorJan Mandel <jmandel@macssd>
Wed, 30 Mar 2016 03:26:50 +0000 (29 21:26 -0600)
committerJan Mandel <jmandel@macssd>
Wed, 30 Mar 2016 03:26:50 +0000 (29 21:26 -0600)
treec8d0b2fd522537f142c41b65f47d3ced096a4f57
parent2bba355c78791e05c45370a03d1e607e3d596d7c
parent8c12caa422a51600bc4c14c0b800c756803b2c65
Merge branch 'jhaley' into jm2/detect2