Skip to content

Commit

Permalink
Merge branch 'master' of git@github.com:joshknowles/rspec-on-rails-ma…
Browse files Browse the repository at this point in the history 
…tchers

Conflicts:

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

0 comments on commit cfda850

Please sign in to comment.