inline diff highlighting for multi-line changes (#227)
simplify multiline diff regexp
Merge branch 'master' into multiline-inline-diff

Conflicts:
	coderay.gemspec
yikes
Merge branch 'master' into multiline-inline-diff
Merge branch 'master' into multiline-inline-diff
Lua scanner for CodeRay. Meta-commit.
This commit is a super-commit containing all the subcommits for
implementing the Lua scanner.
Merge remote-tracking branch 'Quintus/luascanner-onecommit' into lua-scanner
use case+when instead of send and methods
fix for Ruby 1.8, escape { and } in regexps
Merge branch 'master' into multiline-inline-diff
add "id" token kind
use "id" instead of "constant" for css ids
use :tag instead of :type for identifiers
Merge branch 'master' into multiline-inline-diff
Merge branch 'master' into lua-scanner
Merge remote-tracking branch 'origin/lua-scanner-faster' into lua-scanner
escape = in regex (my editor gets confused:-)
fixing rdoc task
Merge branch 'master' into lua-scanner