OSDN Git Service

Merge branch 'master' of github.com:sparky4/16
authorsparky4 <sparky4@cock.li>
Wed, 18 Jan 2017 18:00:39 +0000 (12:00 -0600)
committersparky4 <sparky4@cock.li>
Wed, 18 Jan 2017 18:00:39 +0000 (12:00 -0600)

Trivial merge