Merge branch 'master' into distorted
[mirror-admin] / lib /
2011-07-21 Mark WoodingMirror admin stuff, initial commit.