Merge pull request #1 from knightliao/master#262

badwolfbay wants to merge 1 commit into

knightliao:masterknightliao/disconf:masterfrom

badwolfbay:masterCopy head branch name to clipboard