# HG changeset patch # User Daniel Atallah # Date 1371136145 14400 # Node ID 00e6d5d4c37ff45cfa221b1c1e4e808f9274b9f6 # Parent 76231c6158baaca9dc01b134ef59b5adeba3bae5# Parent 0c24eff9f29d84cfc9ec83f2ec0c51eeb5313473 Merge with soc.2008.masterpassword (merge dangling head that closed branch)