Merge heads.

terryjreedy · terryjreedy · commit 130f303ba5f5 · 2014-08-23T18:22:43.000-04:00
diff --git a/Lib/idlelib/ColorDelegator.py b/Lib/idlelib/ColorDelegator.py
@@ -39,7 +39,6 @@ def __init__(self):
         Delegator.__init__(self)
         self.prog = prog
         self.idprog = idprog
-        self.asprog = asprog
         self.LoadTagDefs()
 
     def setdelegate(self, delegate):
