Fix SQL injection via nested hashes in conditions
CVE-2012-5664 options hashes should only be extracted if there are extra parameters
Merge remote-tracking branch 'rails/2-3-stable' into 2-3-stable
Merge pull request #6722 from adgear/2-3-stable

Backported rails 2.3 fix for CVE-2012-2695
Merge branch '2-3-stable' of git://github.com/rails/rails into 2-3-stable
Merge branch '2-3-stable' into 2-3-security-patches
Merge branch '2-3-security-patches' of github.com:backstop/rails into 2-3-security-patches