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
Merge branch 'master' into multiline-inline-diff
Merge branch 'master' into multiline-inline-diff
Merge branch 'master' into multiline-inline-diff
Merge branch 'master' into multiline-inline-diff
Merge branch 'master' into multiline-inline-diff
cleanup
changelog