cocal/simiki — pull request #1 by cocal (2014-06-14 03:31:30+00:00)
Title: merge

merge 主干