Merge branch '2.2.x' into 2.3.x

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

Diff content is not available