[tika] 04/04: Merge remote-tracking branch 'origin/master'

[tallison]

This is an automated email from the ASF dual-hosted git repository.

tallison pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tika.git

commit b83dc002c771b2da50ef66afc22ffced2e54a487
Merge: 141ff9c c95ede6
Author: TALLISON <talli...@apache.org>
AuthorDate: Fri Nov 9 19:23:28 2018 -0500

    Merge remote-tracking branch 'origin/master'
    
    # Conflicts:
    #   tika-core/src/main/java/org/apache/tika/fork/ForkParser.java
    #   
tika-parsers/src/main/java/org/apache/tika/parser/crypto/Pkcs7Parser.java

 .../main/java/org/apache/tika/fork/ForkParser.java |   3 +-
 .../org/apache/tika/parser/crypto/Pkcs7Parser.java |  47 +++++++++------------
 ...oc => testWORD_italicsSurroundingHyperlink.doc} | Bin
 3 files changed, 21 insertions(+), 29 deletions(-)