merge CHANGES file between nginx 1.2.5 and 1.2.6