Merge branch 'develop' of github.com:cocos2d/cocos2d-iphone into develop

Author: slembcke

cocos2d-ui-tests/tests/CCRendererTest.m

@@ -175,7 +175,10 @@ -(void)setupInfiniteWindowTest
 	CCNode *contentNode = self.contentNode;
 	CGSize size = [CCDirector sharedDirector].designSize;
 
-	[self scheduleBlock:^(CCTimer *timer) {
+	CCNode *node = [CCNode node];
+	[self.contentNode addChild:node];
+	
+	[node scheduleBlock:^(CCTimer *timer) {
 		CCRenderTexture *rt = [CCRenderTexture renderTextureWithWidth:size.width height:size.height];
 
 		[rt begin];