ref: bb41de486617929a449e5ece1018c4ef66802658
parent: 060940410c47bea543fa9ef1518d533c63591597
parent: 1b71d38fed9e132d36aff99b74217b2d6ec83ccd
author: Ori Bernstein <orib@google.com>
date: Wed Jul 11 06:50:56 EDT 2012
Merge branch 'master' of git+ssh://mimir.eigenstate.org/git/ori/mc2