Merge branch 'f.dist' into f.engine
Merge branch 'f.engine' into rc
unify conf define function
add xptemplate_pum_quick_back
Merge branch 'f.src' into f.doc
Merge branch 'f.dist' into f.doc
Merge branch 'f.conf' into f.doc
Merge branch 'f.conf' into f.pum
Merge branch 'f.conf' into rc
add doc about xptemplate_pum_quick_back
Merge branch 'f.doc' into rc
add xptemplate_pum_quick_back support
Merge branch 'f.pum' into rc
Merge branch 'rc'