]> git.notmuchmail.org Git - notmuch/commitdiff
Merge branch 'upstream'
authormartin f. krafft <madduck@debian.org>
Thu, 21 Jan 2010 00:58:55 +0000 (13:58 +1300)
committermartin f. krafft <madduck@debian.org>
Thu, 21 Jan 2010 00:58:55 +0000 (13:58 +1300)
1  2 
configure

diff --cc configure
Simple merge