Merge branch 'master' into feature/cale/cms-master

Conflicts:
	rakefile
This commit is contained in:
Calen Pennington
2012-11-08 12:28:40 -05:00
27 changed files with 921 additions and 64 deletions

View File

@@ -0,0 +1,13 @@
# .coveragerc for common/lib/capa
[run]
data_file = reports/common/lib/capa/.coverage
source = common/lib/capa
[report]
ignore_errors = True
[html]
directory = reports/common/lib/capa/cover
[xml]
output = reports/common/lib/capa/coverage.xml