Merge remote branch 'upstream/obslibmerge' into obslibmerge

Author: grom358

sc2reader/objects.py

@@ -242,7 +242,7 @@ def apply(self):
 
         if self.ability:
             if self.ability not in ABILITIES:
-                print "Unknown ability (%s) in at %s" % (hex(self.ability),self.framestr)
+                print "Unknown ability (%s) in frame %s" % (hex(self.ability),self.frame)
                 #raise ValueError("Unknown ability (%s)" % (hex(self.ability)),)
             ability = ABILITIES[self.ability]
             able = self.get_able_selection(ability)