tree e805140ce1239729c457e56ca08773fcca346136
parent 8ed6585b8163352ee2c551f6955a27ec3fe8d6b4
parent 2ba0beb16ade6f79beef9d4015b1555c09ba6849
author Haoming Zhang <zhm1993zhm@gmail.com> 1505175178 -0700
committer Haoming Zhang <zhm1993zhm@gmail.com> 1505175178 -0700

Merge branch 'haoming-fix' of github.com:30x/apid-core into haoming-fix