Merge branch '2.5.x'
[catacomb] / rand / t /
2013-06-22 Mark WoodingRearrange the file tree.