Merge branch 'master' of github.com:hyde/hyde

hyde/ext/plugins/combine.py

@@ -82,7 +82,7 @@ class CombinePlugin(Plugin):
                             "Resource [%s] removed because combined" % r)
                         r.is_processable = False
 
-    def begin_text_resource(self, resource, text):
+    def text_resource_complete(self, resource, text):
         """
         When generating a resource, add combined file if needed.
         """