perform a new merge from master, resolve conflicts

2013-01-03 10:43:03 -05:00
parent 0e3a022086
commit 7229a9cdaf
90 changed files with 3529 additions and 491 deletions
--- a/cms/.coveragerc
+++ b/cms/.coveragerc
@@ -2,11 +2,13 @@
 [run]
 data_file = reports/cms/.coverage
 source = cms
+omit = cms/envs/*, cms/manage.py

 [report]
 ignore_errors = True

 [html]
+title = CMS Python Test Coverage Report
 directory = reports/cms/cover

 [xml]