Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/tika/repo Commit: http://git-wip-us.apache.org/repos/asf/tika/commit/de6dbd0a Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/de6dbd0a Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/de6dbd0a Branch: refs/heads/master Commit: de6dbd0a7fbb2e24c357020e51f28d21c2ad2ebf Parents: 09cc658 b2821d9 Author: tballison <[email protected]> Authored: Tue May 17 15:51:17 2016 -0400 Committer: tballison <[email protected]> Committed: Tue May 17 15:51:17 2016 -0400 ---------------------------------------------------------------------- .../java/org/apache/tika/detect/NameDetector.java | 15 ++++++++++----- .../org/apache/tika/detect/NameDetectorTest.java | 10 ++++++++++ 2 files changed, 20 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
