tree a05478051902ee1c18718bfd46d3ef45c747af60
parent a288bce8ef3fa225a4c1adffa1e9f023353a16ec
parent 414a4297a2000d8f9276e0ed5d657643f8e94d3a
author Chris Mattmann <mattmann@apache.org> 1502813421 -0700
committer Chris Mattmann <mattmann@apache.org> 1502813421 -0700

Merge branch 'TIKA-2355' of https://github.com/smadha/tika into gsoc17