cobertura/cobertura — pull request #11 by jmrozanec (2013-06-14 18:39:51+00:00)
Title: Fix some files with unresolved merge conflicts

Fix some files with unresolved merge conflicts