Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop
line endings
Merge remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'upstream/develop' into develop
Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop
Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop
Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop
Initial extraction of keyword search messages into properties file.
First pass at Japanese translation of Bundle.properties.
Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop
Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop
Merge branch 'develop' into jp-loc-dev
Finished Japanese translation of Bundle.properties in Bundle_ja.properties.
Added reset command before checkout.
Reformatted code.
Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop
Merge pull request #460 from mrtizmo/develop

KeywordSearch Module Japanese Localization
Merge remote-tracking branch 'upstream/develop' into jenkinsTests
image md5 hash updated
Converted 2 additional searchBox.setText function calls to use getMessage().