resolved merge conflict
authorHamish Downer <dmishd@gmail.com>
Sun, 19 Jun 2011 21:36:41 +0000 (22:36 +0100)
committerHamish Downer <dmishd@gmail.com>
Sun, 19 Jun 2011 21:36:41 +0000 (22:36 +0100)
commit003a28032593275a04fa07a65d4438ff221dd6b2
tree151deaa829b8b5b80273048a2c2d59d20be1ba4f
parent263e56f5a2a91787b0e64cf95948fdb9232a808c
parente5eae033264a091d8678f1b89b865fc5e6c8f758
resolved merge conflict
lib/sup.rb
lib/sup/modes/edit-message-mode.rb