Merge remote-tracking branch 'origin/2.x' into 2.x
Project: http://git-wip-us.apache.org/repos/asf/tika/repo Commit: http://git-wip-us.apache.org/repos/asf/tika/commit/e1498edb Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/e1498edb Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/e1498edb Branch: refs/heads/2.x Commit: e1498edbbb49c40c0d67c46e469c3db18012e0ae Parents: aa5f60d cf96323 Author: tballison <[email protected]> Authored: Mon Mar 21 21:19:03 2016 -0400 Committer: tballison <[email protected]> Committed: Mon Mar 21 21:19:03 2016 -0400 ---------------------------------------------------------------------- .../java/org/apache/tika/parser/external/ExternalParser.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
