Merge branch 'devel' into jm2/devel
commit9000fc2479c4d142daaedad22cdfe3ae4c5a4324
authorJan Mandel <jan.mandel@gmail.com`>
Thu, 18 May 2017 00:25:53 +0000 (17 18:25 -0600)
committerJan Mandel <jan.mandel@gmail.com`>
Thu, 18 May 2017 00:25:53 +0000 (17 18:25 -0600)
treefa105da9255ab9d5284e4214b4ddb67556c36225
parent522e5a2480fe999bfea741f19076fcf6ec92129a
parent70d3916fa3e85d1f8a84be2cf2c6d6aa5c1cb376
Merge branch 'devel' into jm2/devel