merge 2.7.9 release branch

diff --cc Misc/NEWS
index 642ada04986519ad07fb5557fee8b95a63b32acf,8beb192649dbc9c9319a4172458eba59b7b46bfa..3b8474494cfc69f3ca06171302407b00068d4731
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -2,35 -2,17 +2,46 @@@
  Python News
  +++++++++++
  
 +What's New in Python 2.7.10?
 +============================
 +
 +*Release date: XXXX-XX-XX*
 +
 +Core and Builtins
 +-----------------
 +
 +Library
 +-------
 +
 +- Issue #22609: Constructors and update methods of mapping classes in the
 +  collections module now accept the self keyword argument.
 +
 +Documentation
 +-------------
 +
 +- Issue #21514: The documentation of the json module now refers to new JSON RFC
 +  7159 instead of obsoleted RFC 4627.
 +
 +Tools/Demos
 +-----------
 +
 +- Issue #22314: pydoc now works when the LINES environment variable is set.
 +
 +- Issue #18905: "pydoc -p 0" now outputs actually used port.  Based on patch by
 +  Wieland Hoffmann.
 +
 +
+ What's New in Python 2.7.9?
+ ===========================
+ 
+ *Release date: 2014-12-XX*
+ 
+ Library
+ -------
+ 
+ - Issue #22960: Add a context argument to xmlrpclib.ServerProxy.
+ 
+ 
  What's New in Python 2.7.9 release candidate 1?
  ===============================================