[tika] 01/01: Merge tag 'upstream/1.5'

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository tika.

commit e94434d112e85eb6409da2d810eb4ba83ed946ad
Merge: 691842b 5be0960
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Jun 24 16:57:38 2016 +0200

    Merge tag 'upstream/1.5'
    
    Upstream version 1.5


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tika.git