Merge branch 'master' into jm2/detect2
commitf8da6f72e082a9f790f442c58409ddf9f0d0accc
authorJan Mandel <jmandel@macssd>
Mon, 22 Feb 2016 06:04:12 +0000 (22 06:04 +0000)
committerJan Mandel <jmandel@macssd>
Mon, 22 Feb 2016 06:04:12 +0000 (22 06:04 +0000)
tree74d11b9a7832c2515c4ea5eb7bf4b646d4540a70
parent3cc067e45316d226420a261ca97ae4a4c116ab8a
parent5a76a52dc00092c8763457f27d68609751500dfb
Merge branch 'master' into jm2/detect2