ref: 6c02c9507bce9da833f0de58f93c589d5882e7e1
parent: c68209743f675fd934eba8e7d8e659ec2a63a253
parent: adc89d37fecdce58d5af63a39c055369d624f089
author: Ori Bernstein <ori@eigenstate.org>
date: Sun Feb 2 19:15:17 EST 2014
Merge branch 'master' of git+ssh://mimir.eigenstate.org/git/ori/mc