Commit 00622b3d by Jon Frisby

Merge remote-tracking branch 'masa-iwasaki/master' into development

Conflicts: History.txt README.rdoc Rakefile VERSION.yml annotate.gemspec bin/annotate-rails
parents 6ac0df9b 366f3ae2
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment