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
fix for Ruby 1.8, escape { and } in regexps
replace LGPL license with MIT [GH-25]
changelog
Merge branch 'master' into multiline-inline-diff
remove etc folder
test with different Travis settings
test with different Travis settings, again
add :string.:char, remove :regexp.:function color from terminal encode (GH #29)
changelog
Update lib/coderay/encoders/html/numbering.rb
Merge pull request #32 from shurizzle/master

Update html numbering
Merge branch 'master' into multiline-inline-diff
Merge branch 'master' into lua-scanner
Merge remote-tracking branch 'origin/lua-scanner-faster' into lua-scanner