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
fix license file name into gemspec
Merge pull request #107 from jordimassaguerpla/master

fix license file name into gemspec
Add License to gemspec
Merge pull request #112 from jgeiger/patch-1

Add License to gemspec
Update Changes.textile
do not write to disk in benchmarking
fix #106: re-introduce highlightinging of { key: value } in Ruby 1.9 hashes
improve support for Unicode non-alphanumeric characters in Ruby names
whitespace
Merge branch 'master' into fix-ruby-new-hash-syntax