phpspec/phpspec — pull request #241 by MarcelloDuarte (2013-12-25 17:58:13+00:00)
Title: Feature/junit

Fix #188 junit not merging doing to a conflict