Merge github.com:phpDocumentor/ReflectionDocBlock into release/3.x

Author: jaapio

tests/unit/DocBlock/Tags/ExampleTest.php

@@ -20,10 +20,7 @@ public function testExampleWithoutContent()
         $tag = Example::create('"example1.php"');
         $this->assertEquals('"example1.php"', $tag->getContent());
         $this->assertEquals('', $tag->getDescription());
-<<<<<<< b439b29756959ba1476fdfa8fff748fc39528fbc
-=======
         $this->assertEquals('example', $tag->getName());
->>>>>>> Adds name to example tag
     }
 
     /**