Merge remote-tracking branch 'origin/master' into xapian
authorJorge H. Cuadrado <kuadrosxx@gmail.com>
Mon, 3 Oct 2011 00:32:52 +0000 (19:32 -0500)
committerJorge H. Cuadrado <kuadrosxx@gmail.com>
Mon, 3 Oct 2011 00:32:52 +0000 (19:32 -0500)
commite8cb201bf87297294b710b55585893aea258fedc
tree6d04966a90ab45e669df4158c6c14a7af7d84bc2
parentd25e09e43352321d5609dfb09ac337e22c6513d1
parentc463a3155c38437beeac911604c00b175859491f
Merge remote-tracking branch 'origin/master' into xapian

Conflicts:
Gemfile.lock
Gemfile