]> git.notmuchmail.org Git - sup/commitdiff
Merge branch 'master' into next
authorWilliam Morgan <wmorgan-sup@masanjin.net>
Mon, 20 Oct 2008 02:41:01 +0000 (19:41 -0700)
committerWilliam Morgan <wmorgan-sup@masanjin.net>
Mon, 20 Oct 2008 02:41:01 +0000 (19:41 -0700)

Trivial merge