]> granicus.if.org Git - python/commitdiff
Merge heads.
authorBerker Peksag <berker.peksag@gmail.com>
Sat, 27 Sep 2014 19:48:58 +0000 (22:48 +0300)
committerBerker Peksag <berker.peksag@gmail.com>
Sat, 27 Sep 2014 19:48:58 +0000 (22:48 +0300)

Trivial merge