Merge branch 'jm2/devel' from origin into jm2/devel
commitcd65d17558ec62156df3d5d717c6325fe1dcb92f
authorJan Mandel <jan.mandel@gmail.com`>
Sun, 19 Feb 2017 05:05:42 +0000 (18 22:05 -0700)
committerJan Mandel <jan.mandel@gmail.com`>
Sun, 19 Feb 2017 05:05:42 +0000 (18 22:05 -0700)
tree267654eaf03edeaaff9e183528ab3e34dcd745be
parent1bc1c58e037a4606c7c4b4db6a8fddcceead29e0
parent73300968ef240605f8c5665dee8479e7f83114f0
Merge branch 'jm2/devel' from origin into jm2/devel