tree 2c9bd3c5f348b829dbb78fac49d92f516479211f
parent cb8eb4b5d9ab1b16fecc94f1a2be302e59f66227
parent 358340dd2a60a36a69988f1dd7c509cf585acdc8
author plusplusjiajia <jiajia.li@intel.com> 1467703281 +0800
committer plusplusjiajia <jiajia.li@intel.com> 1467703281 +0800

Merge remote-tracking branch 'asf/trunk' into kadmin-remote