prepare for 0.12-rc6
Merge branch 'master' of github.com:OpenGrok/OpenGrok
Merge branch 'master' of github.com:OpenGrok/OpenGrok
Merge branch 'master' of github.com:OpenGrok/OpenGrok
parallelize history indexing of renamed files
fixes #728
fix typo
remove debugging leftover
Stop matching empty strings in heredocs.

Fixes infinite loop that was exposed after upgrading to JFlex 1.5.0.
Stop matching empty strings in uuencoded files (xref and tokenizer).

This avoids infinite loops seen after upgrading to JFlex 1.5.0.
Merge pull request #739 from kahatlen/jflex150

Stop matching empty strings in heredocs.
Merge pull request #732 from vladak/parallel_renames_pullreq

parallelize history indexing of renamed files
Merge branch 'master' of github.com:OpenGrok/OpenGrok
QUERIES has to be fully initialized before getQuery() is called
Merge branch 'master' of github.com:tarzanek/OpenGrok

Conflicts:
	src/org/opensolaris/opengrok/analysis/sh/ShXref.lex