tree 6102570d4fd719c89c512e40d757c72e84d48da0
parent aafafd500a35a603d10120c8ca045da4ba3f2aec
parent 129f6c929f1a7efc2dffc410d8fdca6f94a78eca
author Jon Perritt <jrperritt@gmail.com> 1414179716 -0500
committer Jon Perritt <jrperritt@gmail.com> 1414179716 -0500

fix merge conflicts; don't add relics of 'git mergetool'