Merge branch 'maint' into branch-1.11
commit985d14cd47baa1ae763ad09d3b37f589df52befc
authorStefano Lattarini <stefano.lattarini@gmail.com>
Wed, 21 Mar 2012 19:33:00 +0000 (21 20:33 +0100)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Wed, 21 Mar 2012 19:33:00 +0000 (21 20:33 +0100)
tree5fbb6cbbb14b0fdfcfcc79cca4bef961ace3ac9a
parent2d0af4a3b3a1e89bd53ec2c8ea3cd0fc05ae19fd
parentabf40ce23d53ae93e995d3b85398ec11d8d59706
Merge branch 'maint' into branch-1.11

* maint:
  maint: move definition of XFAIL_TESTS near TESTS