From: William Morgan <wmorgan-sup@masanjin.net>
Date: Thu, 28 May 2009 14:59:45 +0000 (-0400)
Subject: Merge branch 'master' into next
X-Git-Url: https://git.cworth.org/git?a=commitdiff_plain;h=5f589e3c5f0c486a8f63e585df2236858a8a3abc;p=sup

Merge branch 'master' into next

Conflicts:

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

5f589e3c5f0c486a8f63e585df2236858a8a3abc
diff --cc lib/sup/modes/thread-index-mode.rb
index 897dca7,9b44ee3..0bd8110
--- a/lib/sup/modes/thread-index-mode.rb
+++ b/lib/sup/modes/thread-index-mode.rb
@@@ -565,10 -565,9 +565,10 @@@ EO
            t.remove_label l
          else
            t.apply_label l
+           LabelManager << l
          end
-         LabelManager << l
        end
 +      UpdateManager.relay self, :labeled, t.first
      end
  
      regen_text