Commit ab20ee5b by Jon Frisby

Merge remote-tracking branch 'qichunren/master' into development

Conflicts: README.rdoc Rakefile annotate.gemspec lib/annotate.rb lib/tasks/annotate_models.rake
parents 59bac503 614502f9
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