OSDN Git Service

Merge branch 'master' of github.com:sparky4/16
authorsparky4 <sparky4@cock.li>
Fri, 11 Sep 2015 20:06:25 +0000 (15:06 -0500)
committersparky4 <sparky4@cock.li>
Fri, 11 Sep 2015 20:06:25 +0000 (15:06 -0500)

Trivial merge