]> git.notmuchmail.org Git - sup/commitdiff
Merge branch 'master' into next
authorWilliam Morgan <wmorgan-sup@masanjin.net>
Fri, 5 Jun 2009 15:21:38 +0000 (11:21 -0400)
committerWilliam Morgan <wmorgan-sup@masanjin.net>
Fri, 5 Jun 2009 15:21:38 +0000 (11:21 -0400)

Trivial merge