Merge branch 'master' into report-refactoring

Author: sebastianbergmann

PHP/CodeCoverage.php

@@ -361,9 +361,13 @@ public function merge(PHP_CodeCoverage $that)
 
             foreach ($lines as $line => $data) {
                 if ($data !== NULL) {
-                    $this->data[$file][$line] = array_unique(
-                      array_merge($this->data[$file][$line], $data)
-                    );
+                    if (!isset($this->data[$file][$line])) {
+                        $this->data[$file][$line] = $data;
+                    } else {
+                        $this->data[$file][$line] = array_unique(
+                          array_merge($this->data[$file][$line], $data)
+                        );
+                    }
                 }
             }
         }