tree 33a4837b705a986620ba13ffab14a1dfc2bc012b
parent 5ab685167fffede2af38037609b9a1e28f5232b1
parent ef3baddecdf9debdd100030ab4d303e835be64d6
author Jonathan Hart <jono@onlab.us> 1361229648 -0800
committer Jonathan Hart <jono@onlab.us> 1361229648 -0800

Merging in the mastership implementation