]> git.notmuchmail.org Git - sup/commitdiff
Merge branch 'master' into next
authorWilliam Morgan <wmorgan-sup@masanjin.net>
Tue, 15 Jan 2008 05:04:58 +0000 (21:04 -0800)
committerWilliam Morgan <wmorgan-sup@masanjin.net>
Tue, 15 Jan 2008 05:04:58 +0000 (21:04 -0800)

Trivial merge