cobertura/cobertura — pull request #91 by jmrozanec (2013-11-08 03:20:26+00:00)
Title: Resolve conflict and merge changes

Fix unresolved conflict.