ref: 9873b208d15f5486f9b417f4de0f70be4b57ae24
parent: 3fccc8ae5d24b1ec3e15facbb765a219f5438c2c
parent: dbd4b72dbcee6e002a61b8a15634be2e595dd487
author: Ori Bernstein <ori@eigenstate.org>
date: Mon Sep 3 18:45:22 EDT 2012
Merge branch 'master' of git+ssh://mimir.eigenstate.org/git/ori/mc2