]> git.notmuchmail.org Git - sup/commitdiff
Merge branch 'master' into next
authorWilliam Morgan <wmorgan-sup@masanjin.net>
Wed, 27 May 2009 14:19:13 +0000 (10:19 -0400)
committerWilliam Morgan <wmorgan-sup@masanjin.net>
Wed, 27 May 2009 14:19:13 +0000 (10:19 -0400)

Trivial merge