merged changes between nginx-1.4.5 and nginx-1.4.6

updated CHANGES.*