rethinkdb/docs — pull request #480 by neumino (2014-08-26 16:13:24+00:00)
Title: Fix merge in faq

Ping @coffeemug, @chipotle -- Could one of you take a quick look?
I'll deploy after that.