Fix up broken merge commit.
authorChris Ball <cjb@laptop.org>
Mon, 2 Jan 2012 20:43:13 +0000 (15:43 -0500)
committerChris Ball <cjb@laptop.org>
Mon, 2 Jan 2012 20:43:13 +0000 (15:43 -0500)
commitb1527580ece00959b9e9d90e8f0f7dd1bce0342a
treebda1bfc4c43e8ef9ee748d6af0e622aa282e9cbb
parentbf52e18aad6e0e8effcadc6b90dfedf4d15b1859
Fix up broken merge commit.
interfaces/web/web.py