merge CHANGES file between nginx 1.2.5 and 1.2.6
Merge pull request #179 from cfsego/merge

merge CHANGES file between nginx 1.2.5 and 1.2.6