correct way to search for Java on OS X
apgdiff-compatible comments
check for '#' comments when doing a SQL diff (apgdiff is unable to parse such comments for some reason)
Add script to start solr.
Integrate Solr into supervisor.
ExtUtils::MakeMaker's unit tests got fixed in 6.68 so an exception is no longer needed
Merge branch 'master' into cm_create_controversy