Merge remote-tracking branch 'origin/xapian'
authorDavid A. Cuadrado <krawek@gmail.com>
Wed, 5 Oct 2011 17:20:47 +0000 (12:20 -0500)
committerDavid A. Cuadrado <krawek@gmail.com>
Wed, 5 Oct 2011 17:20:47 +0000 (12:20 -0500)
commitbff251c69ed1ba8d3f44c2a240727ddc6d9a2a77
tree3713f6fef9d189c4a11657a612afdb5046e2f1e9
parente650dd79141369eaabf042412dfbda6a3b26930a
parent54b1ec367f537f1f992a77c0e542b7089f166846
Merge remote-tracking branch 'origin/xapian'

Conflicts:
Gemfile.lock
Gemfile
Gemfile.lock