Merge branch 'inbox-del' into testing
authorBrion Vibber <brion@pobox.com>
Thu, 4 Feb 2010 23:12:40 +0000 (15:12 -0800)
committerBrion Vibber <brion@pobox.com>
Thu, 4 Feb 2010 23:12:40 +0000 (15:12 -0800)
commitba26ffeef19576fe2587007de43b5077b0cd6aa5
treee487e4d86fc8c5b1101cf143d0b7d757d4da4df1
parent2eadeca74515802dccc63d7ec84af1bc7d1338d9
parent9554b4ccbf0783516ea1735a7c999919be33c280
Merge branch 'inbox-del' into testing