]> git.notmuchmail.org Git - sup/commitdiff
Merge branch 'master' into next
authorWilliam Morgan <wmorgan-sup@masanjin.net>
Wed, 9 Jan 2008 18:08:11 +0000 (10:08 -0800)
committerWilliam Morgan <wmorgan-sup@masanjin.net>
Wed, 9 Jan 2008 18:08:11 +0000 (10:08 -0800)

Trivial merge