Merge branch 'master' into jm2/devel
commit1f73f3d44526c321c1737faff3bf36aa54f153ba
authorJan Mandel <jan.mandel@gmail.com`>
Sat, 8 Oct 2016 18:07:34 +0000 (8 12:07 -0600)
committerJan Mandel <jan.mandel@gmail.com`>
Sat, 8 Oct 2016 18:07:34 +0000 (8 12:07 -0600)
treec5af050ea2f11029e7ad1571bf19cb63c2396906
parentfacac7103f123aee936da3db8af282d57fdd1327
parentf016f7cd40f1b865d687878d121fd7495e3b60e8
Merge branch 'master' into jm2/devel