1
2
foo
Merge remote-tracking branch 'origin/r141129' into issue#4

Conflicts:
	readme.md
Merge pull request #15 from toksea/issue#4

修复 #4
Merge pull request #16 from toksea/r141129

R141129