Merge branch 'master' into next next
authorWilliam Morgan <wmorgan-sup@masanjin.net>
Mon, 12 Oct 2009 13:51:09 +0000 (09:51 -0400)
committerWilliam Morgan <wmorgan-sup@masanjin.net>
Mon, 12 Oct 2009 13:51:09 +0000 (09:51 -0400)
commit09e6a71e232d2d3352fe45b13789c3441e3ac937
tree01e5edd2a41bff76ca534cf473358c15474e0266
parent0b8ea502ed8e7536661db066fe046f936a3473a2
parent2dfd378b616243d03203e49f5ee29636051d3cbf
Merge branch 'master' into next

Conflicts:
lib/sup/ferret_index.rb