Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-senssoft
authormsbeard <msbeard@apache.org>
Fri, 26 Jan 2018 23:26:12 +0000 (18:26 -0500)
committermsbeard <msbeard@apache.org>
Fri, 26 Jan 2018 23:26:12 +0000 (18:26 -0500)
commit18d45be0f3c2cc35a034ed57694d57bfe5bd6ff9
treed06934f0bc5a821dfc7923556fc6404138426daa
parent29a4109b736ceee0a10c1a2b7b0db2dc413419d0
parenteaae53a909617355d66c0e0db50bf297a1e49ccc
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-senssoft