Merge 'trunk' into 'fix_request_uri'
authorTomas Doran <bobtfish@bobtfish.net>
Sun, 2 May 2010 23:46:42 +0000 (23:46 +0000)
committerTomas Doran <bobtfish@bobtfish.net>
Sun, 2 May 2010 23:46:42 +0000 (23:46 +0000)
commitb8a0490e86b085c13b2ef727a6be45d075bdb044
tree601ddd9339caf43ae911f92b759ab88830778d12
parentd827e95c0b05a17a62d4cb911b70621708c8753e
parent58541c41f8a186f0ede06ffb2e048639041f7f60
Merge 'trunk' into 'fix_request_uri'

r15492@tomas-dorans-macbook-pro (orig r13196):  rafl | 2010-05-02 23:44:30 +0000
Unbreak tests by actually adding the module they're supposed to test.