sleuthkit/autopsy — pull request #535 by SynapticNulship (2014-03-11 21:17:28+00:00)
Title: Searchoptions

Bundles and Bundles_ja (japanese localization) .properties conflicts resolved: I used develop branch for every conflict except those properties that were new with head (my branch). The .java conflicts were easily resolved.