Merge branch 'mentions-attachments-hook'
authorRich Lane <rlane@club.cc.cmu.edu>
Sun, 7 Mar 2010 21:18:36 +0000 (13:18 -0800)
committerRich Lane <rlane@club.cc.cmu.edu>
Sun, 7 Mar 2010 21:18:36 +0000 (13:18 -0800)
commit582e97faf70e41caa65109ac8bdc1c7ecdecd718
tree520354e0021f2fb0127286ba57cc23f7293a20c0
parent1bc1e724993ab29478abb45e45ee381df547da2b
parent4966f9002b76fd6974312b9168ceeb6a65af6954
Merge branch 'mentions-attachments-hook'

Conflicts:
lib/sup/modes/edit-message-mode.rb
lib/sup/modes/edit-message-mode.rb