2 Commits

Author	SHA1	Message	Date
Kenji Nagahashi	1f65eff828	Merge remote-tracking branch 'origin/master' into cdx-server ... Conflicts: pywb/cdx/cdxdomainspecific.py pywb/cdx/cdxserver.py pywb/cdx/test/cdxserver_test.py setup.py tests/test_integration.py	2014-02-28 19:47:24 +00:00
Kenji Nagahashi	9eda5ad97e	address test cases broken by previous commit. ... move py.test fixture and fixture classes (TestExclusionPerms, PrintReporter) to tests.fixture module. update test_config.yaml accordingly.	2014-02-28 01:39:04 +00:00