Revert "change line"

This reverts commit 8cfa79caedd457292ca215bd4c01f3a4d807d4ba.
Merge commit '2d50508bb9452d22587574e67d97f2156278b8b4'
Merge commit '1c18c8c41239da9541e1592f7c8c66e9b73eabd5'
Merge pull request #1 from cnnic/master

merge from cnnic
Merge pull request #66 from warmdawn/master

merge from warmdarn