Merge branch '2.4.x' into 3.0.x

* 2.4.x:
  Disable tests that fail on 2.6.x due to #15912
This commit is contained in:
Jeff McCune 2012-08-20 14:24:52 -07:00
commit 55b5e6885d

Diff content is not available