change internal magic to { "Magic": "CLAMJSON"
Move all the crypto API to clamav.h
Merge remote-tracking branch 'origin/master'
add version to property file magic.
add spreadsheet of document properties to ClamAV docs.
ole2: cleaned-up commented code
json: added unique identifier for root filetype (RootFileType)
Add the PDF version to the JSON properties
Use the new timeout facility
Add more PDF properties
Clean up the XML parser in the unit tests
ooxml: moved value parsing into separate function
ooxml: cleaned up comments
ooxml: restructured code for continued parsing after excedding rlvl limit
ooxml: report hitting recursion limit to json
Merge branch 'master' of git.clam.sourcefire.com:/var/lib/git/clamav-devel
Bump SO major version number
Check to make sure we should be adding properties
Remove unused debugging code
ooxml: added elements attribute report to json
ooxml: modified object generation to handle elements with text and element data
Merge branch 'master' of git.clam.sourcefire.com:/var/lib/git/clamav-devel
ooxml/ole2: code review changes