Merge commit 'origin/reply-to-hook'

Conflicts:

	lib/sup/modes/reply-mode.rb

diff --cc lib/sup/modes/reply-mode.rb
index d6a7dc68a7fc9f5aa6f2e9fc63fc0d60c07659f1,de086095ea1d181579f717ec88902551fa0e90f0..4e08e8e9158bead401d437d4933d1a3ed0c42b81
--- 1/lib/sup/modes/reply-mode.rb
--- 2/lib/sup/modes/reply-mode.rb
+++ b/lib/sup/modes/reply-mode.rb
@@@ -19,16 -19,17 +19,27 @@@ Return value
    A string containing the text of the quote line (can be multi-line)
  EOS
  
 +  HookManager.register "reply-from", <<EOS
 +Selects a default address for the From: header of a new reply.
 +Variables:
 +  message: a message object representing the message being replied to
 +    (useful values include message.recipient_email, message.to, and message.cc)
 +Return value:
 +  A Person to be used as the default for the From: header, or nil to use the
 +  default behavior.
 +EOS
 +
+   HookManager.register "reply-to", <<EOS
+ Set the default reply-to mode.
+ Variables:
+   modes: array of valid modes to choose from, which will be a subset of
+              [:#{REPLY_TYPES * ', :'}]
+          The default behavior is equivalent to
+              ([:list, :sender, :recipent] & modes)[0]
+ Return value:
+   The reply mode you desire, or nil to use the default behavior.
+ EOS
+ 
    def initialize message
      @m = message