update manifest post-merge
authorDave Rolsky <autarch@urth.org>
Mon, 15 Sep 2008 15:45:27 +0000 (15:45 +0000)
committerDave Rolsky <autarch@urth.org>
Mon, 15 Sep 2008 15:45:27 +0000 (15:45 +0000)
commitac8db288f9dd54f8b3ab1f381ea6b4f8c89cfd42
tree144e931f80862ae6c02451328b773d73afa970c2
parent9a7ff69cbfeb6393007136924b25ddef7e1aa25d
update manifest post-merge
MANIFEST