]> git.notmuchmail.org Git - sup/commitdiff
Merge branch 'master' into next
authorWilliam Morgan <wmorgan-sup@masanjin.net>
Mon, 23 Mar 2009 14:38:28 +0000 (10:38 -0400)
committerWilliam Morgan <wmorgan-sup@masanjin.net>
Mon, 23 Mar 2009 14:38:28 +0000 (10:38 -0400)
1  2 
README.txt

diff --cc README.txt
Simple merge