Commit graph

1 commit

Author SHA1 Message Date
Sam Lown 1bced3b207 Merge branch 'master' of https://github.com/2moro/couchrest_model into 2moro-dirty
Conflicts:
	.gitignore
	lib/couchrest/model/base.rb
	lib/couchrest/model/configuration.rb
	lib/couchrest_model.rb
2011-04-20 10:47:36 +02:00