Commit be8404a7680fa1951e20abdaea704156b3345876

Edward Thomson 2015-02-03T21:51:48

merge-like operations: lock index while working