Merge branch 'devel'
commitda1b69e1d723a3977589d5bd6afc4bc120d8fd3e
authorJan Mandel <jan.mandel@gmail.com>
Sat, 30 Jun 2018 06:00:43 +0000 (30 00:00 -0600)
committerJan Mandel <jan.mandel@gmail.com>
Sat, 30 Jun 2018 06:00:43 +0000 (30 00:00 -0600)
treeacc54244b445b9b5813e8fa86b77cca8f506df9b
parent84e239785351ac5aeb81c5a778ce86fa0f5115e0
parent40922c4c29ba5388422b2d0f52da5ea6df7945c0
Merge branch 'devel'