ref: a0ab14aa2623261f26d2ee5f60bd240b086a3e7d
parent: 9ed8ab553a8d92893f0417abcc2adbfc3f94e478
parent: dae8be83400216caec8ecda7da7a32f7e48e9a7c
author: Ori Bernstein <ori@eigenstate.org>
date: Thu Aug 21 20:17:00 EDT 2014
Merge branch 'master' of git+ssh://mimir.eigenstate.org/git/ori/mc Conflicts: libstd/sys-linux.myr