ref: 5d32b4d66a0065bec228c9bbd61835e11718827c
parent: 4b2947c3f828c6895ab15eb83814321d112d3c1a
parent: 8e1b91f8c81e73d60294cbb2f90449c38343d878
author: Ori Bernstein <ori@eigenstate.org>
date: Tue Jun 19 17:10:36 EDT 2012
Merge branch 'master' of git+ssh://mimir.eigenstate.org/git/ori/mc2