jtakayama/makahiki — pull request #3 by jtakayama (2013-10-30 20:09:43+00:00)
Title: Merging in upstream changes.

Merging in upstream changes from csdl/makahiki and master.