Commit 43520d82 by Jon Frisby

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

Conflicts: README.rdoc Rakefile annotate.gemspec bin/annotate lib/annotate/annotate_models.rb tasks/migrate.rake
parents 075c125e 6311d7c1
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