ref: f58f2ae13065c5338a7b81218b123e3f4859fece
parent: e15b9b8ff63de5a461257b1ecfa9689e853c90ab
parent: 62f197bc9c8a7d3493596e55462d7eb9bbe21ae1
author: Ori Bernstein <ori@eigenstate.org>
date: Wed Jul 25 17:00:18 EDT 2012
Merge branch 'master' of git+ssh://mimir.eigenstate.org/git/ori/mc2