amplab/tachyon — pull request #259 by uronce-cc (2014-07-11 03:51:45+00:00)
Title: Manual merge

manual merge