Permalink
Browse files

Merge branch 'master' of git@github.com:joshknowles/rspec-on-rails-ma…

…tchers

Conflicts:

	CHANGELOG
  • Loading branch information...
2 parents 89e73dc + 4e88e05 commit cfda85023be7b8bc9fd8ecda9b251d85399fb76e @joshknowles committed Mar 3, 2008
Showing with 0 additions and 0 deletions.

0 comments on commit cfda850

Please sign in to comment.