Better minimum validates_length_of examples (adapted from master).
Merge pull request #5653 from eee-c/patch-1

Doc fixes in 2.3: validates_length_of
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
CVE-2013-0156: Safe XML params parsing. Doesn't allow symbols or yaml.
bumping to 2.3.15 :cry::gun:
Revert "bump up rack version to the one that includes the Hash DoS fix"

Rack 1.1.3 also changes the Set-Cookie header to expects a
newline-delimited string instead of an Array, which breaks Rails 2.3's
expectations in a variety of ways.

This reverts commit 27a508c91e04b619c8a1eb50ef115b226b21182c.

Conflicts:
	actionpack/Rakefile
Fix for CVE-2013-0155
Bump to 2.3.16

Conflicts:

	actionpack/Rakefile