From: Zachary Ware <zachary.ware@gmail.com>
Date: Mon, 13 Apr 2015 15:49:43 +0000 (-0500)
Subject: Merge heads
X-Git-Tag: v2.7.10rc1~49
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=779b44a1c2bba3de462c040296cd8605c988d29a;p=thirdparty%2FPython%2Fcpython.git

Merge heads
---

779b44a1c2bba3de462c040296cd8605c988d29a