]> git.notmuchmail.org Git - sup/commitdiff
Merge branch 'master' into next
authorWilliam Morgan <wmorgan-sup@masanjin.net>
Mon, 10 Nov 2008 03:59:43 +0000 (19:59 -0800)
committerWilliam Morgan <wmorgan-sup@masanjin.net>
Mon, 10 Nov 2008 03:59:43 +0000 (19:59 -0800)

Trivial merge