a627c323e9d21f61f918156c7a5fb08fd95e52da not-for-merge branch 'master' of git://github.com/pjz/kid_manager