Merge branch 'jm2/detect2' into jm2/perimeter
commitb154a5bdf9ef875d67862faa438694784a630059
authorJan Mandel <jan.mandel@gmail.com>
Fri, 27 May 2016 07:54:09 +0000 (27 01:54 -0600)
committerJan Mandel <jan.mandel@gmail.com>
Fri, 27 May 2016 07:54:09 +0000 (27 01:54 -0600)
treedca74cb27565be0ba296eea4c8cc3319e59d8ab1
parentb4464e53aa3770310706c9d4dad9cdb64e0659b3
parentf7bcaa160130585db0c550588c2bc858b8aabaaf
Merge branch 'jm2/detect2' into jm2/perimeter