merge some minor conflicts in test code from the 393-2 branch and trunk
authorZooko O'Whielacronx <zooko@zooko.com>
Wed, 10 Aug 2011 17:21:39 +0000 (10:21 -0700)
committerZooko O'Whielacronx <zooko@zooko.com>
Wed, 10 Aug 2011 17:21:39 +0000 (10:21 -0700)
commit95a75515860c7a535e319511e159ed5c4d1cee4b
tree3757d0a8e746431d668361ce57b993d7e216597a
parent43ba172f65aaa0386c58ff1554bd0d8c7427dc1c
merge some minor conflicts in test code from the 393-2 branch and trunk
src/allmydata/test/test_dirnode.py
src/allmydata/test/test_web.py