]> git.notmuchmail.org Git - sup/commit
Merge branch 'master' into next
authorWilliam Morgan <wmorgan-sup@masanjin.net>
Thu, 28 May 2009 14:59:45 +0000 (10:59 -0400)
committerWilliam Morgan <wmorgan-sup@masanjin.net>
Thu, 28 May 2009 14:59:45 +0000 (10:59 -0400)
commit5f589e3c5f0c486a8f63e585df2236858a8a3abc
tree85f1e669eaf5c3ecbc56ae89a34ea665ce5998bf
parent2d2eb6aea581c4f562004182b9d5edef7549f92f
parent71bbe4d3b74620adf8014f9ddc4698372c992f0b
Merge branch 'master' into next

Conflicts:

lib/sup/modes/thread-index-mode.rb
lib/sup/modes/thread-index-mode.rb