Merge branch '2.4.x' into 2.5.x
[catacomb] / key / key-binary.c
2013-06-22 Mark WoodingRearrange the file tree.