OSDN Git Service

Merge branch 'master' of github.com:sparky4/16
authorsparky4 <sparky4@cock.li>
Mon, 13 Feb 2017 18:55:06 +0000 (12:55 -0600)
committersparky4 <sparky4@cock.li>
Mon, 13 Feb 2017 18:55:06 +0000 (12:55 -0600)

Trivial merge