ref: 422bc7217a71af4a1485202bb1870d40fd504870
parent: 0777dce112452cb95d09037ef49a5f35b48ed6e3
parent: 5b2e3e6495320fa7ce29823d72c27de3194befd4
author: Ori Bernstein <ori@eigenstate.org>
date: Mon Aug 26 16:20:01 EDT 2013
Merge branch 'master' of git+ssh://git.eigenstate.org/git/ori/mc