Merge "Added docu headers to content(handler) files"

diff --cc includes/content/AbstractContent.php
index 488c4be,1a730bc..495711a
--- 1/includes/content/AbstractContent.php
--- 2/includes/content/AbstractContent.php
+++ b/includes/content/AbstractContent.php
@@@ -391,4 -343,4 +411,4 @@@ abstract class AbstractContent implemen
        public function matchMagicWord( MagicWord $word ) {
                return false;
        }
--}
++}

diff --cc includes/content/Content.php
index 1745ae2,3ef73db..d830dc7
--- 1/includes/content/Content.php
--- 2/includes/content/Content.php
+++ b/includes/content/Content.php
@@@ -467,4 -483,4 +487,4 @@@ interface Content 
        #   [11:59] <vvv> Hooks are ugly; make CodeHighlighter interface and a
        #   config to set the class which handles syntax highlighting
        #   [12:00] <vvv> And default it to a DummyHighlighter
--}
++}

diff --cc includes/content/ContentHandler.php
Simple merge