Merge remote-tracking branch 'upstream/master'
Project: http://git-wip-us.apache.org/repos/asf/tika/repo Commit: http://git-wip-us.apache.org/repos/asf/tika/commit/6c595fbd Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/6c595fbd Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/6c595fbd Branch: refs/heads/master Commit: 6c595fbd3ecefe598cc96b34e2e0baa1f064f6df Parents: ac4c0b2 08e38bb Author: manali <[email protected]> Authored: Wed Feb 24 22:25:07 2016 -0800 Committer: manali <[email protected]> Committed: Wed Feb 24 22:25:07 2016 -0800 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ tika-translate/pom.xml | 2 +- .../language/translate/CachedTranslator.java | 25 ++++++++++++-------- 3 files changed, 18 insertions(+), 11 deletions(-) ----------------------------------------------------------------------
