]> git.cworth.org Git - sup/commit
Merge branch 'master' into next
authorWilliam Morgan <wmorgan-sup@masanjin.net>
Tue, 28 Jul 2009 15:24:20 +0000 (11:24 -0400)
committerWilliam Morgan <wmorgan-sup@masanjin.net>
Tue, 28 Jul 2009 15:24:20 +0000 (11:24 -0400)
commit6a2730628825be024f852f2808b37ad2a8f1068f
treed198542895a5e9481416270d4e3a7437f98fc33d
parentefedd495db72618aa9af9a576963abbbf69aaf97
parentf4af1964081605756a99cc7c18b9a7b3433b0fdc
Merge branch 'master' into next

Conflicts:
lib/sup/index.rb
lib/sup/ferret_index.rb