OSDN Git Service

Merge a branch.
authorSimon Forman <sforman@hushmail.com>
Sun, 22 Apr 2018 01:36:31 +0000 (18:36 -0700)
committerSimon Forman <sforman@hushmail.com>
Sun, 22 Apr 2018 01:36:31 +0000 (18:36 -0700)
commitb2a4c0e1f88f7065ade6e037417c1fcf2ab46cce
tree54351d6fe6ceb52251dbbc11bd164dc0652176d8
parenta682537597f875285a80acaff986625403a6c9e2
parenta3c3709e4c3252d698690f8a0978b046f83c9712
Merge a branch.

I sure hope I'm doing this right.