Merge commit 'origin/more-vi-keys'
commit6d21fb93376ad4ccb651a8e98b385cef8343fa7e
authorWilliam Morgan <wmorgan-sup@masanjin.net>
Sun, 25 May 2008 04:12:46 +0000 (24 21:12 -0700)
committerWilliam Morgan <wmorgan-sup@masanjin.net>
Sun, 25 May 2008 04:12:46 +0000 (24 21:12 -0700)
tree4676d88b14f6baf96696038441dacd4ae86b5766
parente3328775b1a2d820c39882c23a0c923f6e802c04
parent34836b81834c5ce7128e8c9e81c3e86409afb00b
Merge commit 'origin/more-vi-keys'