OSDN Git Service

Merge branch 'master' of github.com:sparky4/16
authorsparky4 <sparky4@cock.li>
Fri, 15 Apr 2016 16:58:37 +0000 (11:58 -0500)
committersparky4 <sparky4@cock.li>
Fri, 15 Apr 2016 16:58:37 +0000 (11:58 -0500)

Trivial merge