* '3-1-stable' of github.com:rails/rails: (91 commits)
Merge pull request #3049 from brainopia/fix_to_query_edge_case
Bump AR-JDBC version. THis version is compatible with 3.1 and above
Revert "Fixed Apache configuration for gzipped assets: FilesMatch and LocationMatch cannot be nested."
Fixed Apache configuration for gzipped assets: FilesMatch and LocationMatch cannot be nested. (cherry picked from commit 5e2bf4d)
Proper lines numbers for stack trace info
Merge pull request #3040 from guilleiguaran/asset-host-should-not-be-nil-precompile
cherry-pick #1318 into 3-1-stable
Bumping up to 3.1.1.rc1
Add some CHANGELOG missing stuff
Allow asset tag helper methods to accept :digest => false option in order to completely avoid the digest generation.
Add equivalent nginx configuration
Fix typos and broken link on asset pipeline guide
Merge pull request #3015 from guilleiguaran/clear-tmp-cache-on-precompile
Merge pull request #3012 from guilleiguaran/3-1-1-changelogs
Revert "Provide a way to access to assets without using the digest, useful for static files and emails"
Merge pull request #3011 from guilleiguaran/disable-sprockets-server
Provide a way to access to assets without using the digest, useful for static files and emails
Merge pull request #2922 from wayneeseguin/master
getting_started.textile: Fix typo and split up a sentence in section "Building a Multi-Model Form"
getting_started.textile: Fix typos in section "Rendering a Partial Form"