Browse files

Merge branch 'connection-pool-thread-fixes' of github.com:mjtko/rails…

… into connection-pool-thread-fixes

Conflicts:
	activerecord/lib/active_record/query_cache.rb
  • Loading branch information...
2 parents 648eb48 + ab077d5 commit 4d530c3c4128dad459132c77770b9b88c00914d3 @mjtko committed Oct 7, 2011
Showing with 0 additions and 0 deletions.

0 comments on commit 4d530c3

Please sign in to comment.