ref: 3cbdb83dbbc80b2c8a3458e5b1a1ae5d3080fb3b
parent: 8c7095cc5e7701e9e9f6f17d8dd60e32c2dc5bd0
parent: 1ef5877bce5a4fcbe6e68b00f1ba087384d6343c
author: Ori Bernstein <ori@eigenstate.org>
date: Wed Aug 21 07:24:35 EDT 2013
Merge branch 'master' of git+ssh://git.eigenstate.org/git/ori/mc