New commits:
commit ee29fb779e51fc9bb3899f60d3d900a8a52eca73
Merge: 475bd7049e0c94058ca86f6e1b02d7a7f8c4093f
f899ebd997c596cb5174add5c0f5837a7f79259b
Author: George Sherwood <pilot AT sourcemage.org>
Commit: George Sherwood <pilot AT sourcemage.org>
Merge branch 'master' of ssh://gsherwood AT scm.sourcemage.org/smgl/grimoire
commit 475bd7049e0c94058ca86f6e1b02d7a7f8c4093f
Author: George Sherwood <pilot AT sourcemage.org>
Commit: George Sherwood <pilot AT sourcemage.org>