Merge commit 'origin/unedited-newlines'
authorWilliam Morgan <wmorgan-sup@masanjin.net>
Sun, 25 May 2008 04:22:30 +0000 (21:22 -0700)
committerWilliam Morgan <wmorgan-sup@masanjin.net>
Sun, 25 May 2008 04:22:30 +0000 (21:22 -0700)
commitf4adc029a972c56d22def1e903dae7d7be89e0b0
treee1e1c69ad5af68390a188fee0baa4e47f269b921
parent1a84450dc26aab7b0a2a84876509d860b942149e
parente4602c0d124a91d4d78b74320d9420d4c0d577a8
Merge commit 'origin/unedited-newlines'

Conflicts:

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