OSDN Git Service

Merge branch 'master' of github.com:sparky4/16
authorsparky4 <sparky4@cock.li>
Mon, 14 Nov 2016 19:41:36 +0000 (13:41 -0600)
committersparky4 <sparky4@cock.li>
Mon, 14 Nov 2016 19:41:36 +0000 (13:41 -0600)

Trivial merge