tree 24676995be759776592eb1d36c91d7e8327ca2c7
parent 4baf3be096ab959b2623b29695cd88bda33c68e4
parent 6ae2d04657fbda43aa10a11da270247487a67686
author Jonathan Hart <jono@onlab.us> 1364069732 -0700
committer Jonathan Hart <jono@onlab.us> 1364069732 -0700

Merge branch 'master' into regsync