]> granicus.if.org Git - python/commit
Merge.
authorCharles-François Natali <cf.natali@gmail.com>
Fri, 20 Jun 2014 21:59:32 +0000 (22:59 +0100)
committerCharles-François Natali <cf.natali@gmail.com>
Fri, 20 Jun 2014 21:59:32 +0000 (22:59 +0100)
commit8aa9e4268fae4646b40d230962d74a6b61397217
tree2775982695cb0a1071d13c34f48b2292a9efd7e4
parent57398c31c40972e4cba4bde8c431a66f5ca6f77e
parent5d82895c5eb50764d5e4ec77ca8ce140ec5d9643
Merge.