Merge branch 'jm2/devel_tmp' into jm2/devel
commit3a23bd766491d2b66d9eeba360435764b3808830
authorJan Mandel <jan.mandel@gmail.com`>
Sat, 10 Jun 2017 23:57:08 +0000 (10 17:57 -0600)
committerJan Mandel <jan.mandel@gmail.com`>
Sat, 10 Jun 2017 23:57:08 +0000 (10 17:57 -0600)
tree80f95e8308dd0dd00bcb5f4fe26f387f2ba81dc9
parent816ca91f792fc34733f1d7b5c0f092a4a9660841
parent265bb362ff1579c4bd7c7db2564c4aebebe98efd
Merge branch 'jm2/devel_tmp' into jm2/devel