Merge commit '0d0dc9de679d36b2fe78306e3e8f223d8baf5b62' into ha
authorWayne Schneider <wayne@indexdata.com>
Fri, 29 Jul 2016 17:41:27 +0000 (12:41 -0500)
committerWayne Schneider <wayne@indexdata.com>
Fri, 29 Jul 2016 17:41:27 +0000 (12:41 -0500)
commit2d6f9ef3234fad0f19bc782d75229ec7b211819c
treef989f3df5f6e9a39981c4567dfdc0043e649b3b9
parent4db21d182fb825a9cfc150ebde91be7d62cc5e32
parent0d0dc9de679d36b2fe78306e3e8f223d8baf5b62
Merge commit '0d0dc9de679d36b2fe78306e3e8f223d8baf5b62' into ha