]> git.cworth.org Git - sup/commit
Merge branch 'master' into next
authorWilliam Morgan <wmorgan-sup@masanjin.net>
Wed, 9 Sep 2009 14:08:33 +0000 (10:08 -0400)
committerWilliam Morgan <wmorgan-sup@masanjin.net>
Wed, 9 Sep 2009 14:11:20 +0000 (10:11 -0400)
commit3f08a0191a824c5d6e7731a3d25106d1a0c3931e
tree2042892c9c3cb296583a0ae348e667a00dd04dd0
parent9a3d7fa7473b5852bc65a562fa3e8d8964d16c0e
parent4c3b5b0d20df18dfb914d0732ba96c0617a51c57
Merge branch 'master' into next

Conflicts:
lib/sup/ferret_index.rb
bin/sup
lib/sup/buffer.rb
lib/sup/ferret_index.rb
lib/sup/modes/console-mode.rb
lib/sup/xapian_index.rb