Files · 5f17dbf78d8204a49e990ea4b629adb2d7b2c878 · open-source / annotate

Merge remote-tracking branch 'alexch/master' into development · 5f17dbf7

authored Mar 01, 2012

Conflicts:
	.gitignore
	Gemfile
	History.txt
	Rakefile
	annotate.gemspec
	lib/annotate/annotate_models.rb
	spec/annotate/annotate_models_spec.rb
	spec/spec_helper.rb
	todo.txt

5f17dbf7

Name	Last commit	Last update
bin		Loading commit data...
lib		Loading commit data...
spec		Loading commit data...
tasks		Loading commit data...
.gitignore		Loading commit data...
.rvmrc		Loading commit data...
Gemfile		Loading commit data...
Gemfile.lock		Loading commit data...
History.txt		Loading commit data...
README.rdoc		Loading commit data...
Rakefile		Loading commit data...
VERSION.yml		Loading commit data...
annotate.gemspec		Loading commit data...
todo.txt		Loading commit data...

README.rdoc