Merge remote-tracking branch 'origin/master'

2012-11-12 15:01:59 +01:00 · 2012-11-12 15:01:59 +01:00 · e0fac143f3
commit e0fac143f3
parent 473df103cf 2fd3f7fcdf
2 changed files with 2 additions and 0 deletions
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@ -3,6 +3,7 @@
         backupGlobals="false"
         backupStaticAttributes="false"
         strict="true"
+         colors="true"
         verbose="true">

    <selenium>
--- a/phpunit.xml.nocoverage
+++ b/phpunit.xml.nocoverage
@ -3,6 +3,7 @@
         backupGlobals="false"
         backupStaticAttributes="false"
         strict="true"
+         colors="true"
         verbose="true">

    <selenium>