tree b522f5144644ecbd2ed7b2eb6fbcf906d89ddd85
parent 58d18d4a64a5ff11989ee0659a46619dddff2381
author Tatu Saloranta <tatu.saloranta@iki.fi> 1454135475 -0800
committer Tatu Saloranta <tatu.saloranta@iki.fi> 1454135475 -0800

try to prevent merge conflicts for pom.xml