OSDN Git Service

Merge branch 'master' of github.com:sparky4/16
authorsparky4 <sparky4@cock.li>
Sun, 17 Apr 2016 22:02:56 +0000 (17:02 -0500)
committersparky4 <sparky4@cock.li>
Sun, 17 Apr 2016 22:02:56 +0000 (17:02 -0500)

Trivial merge