Merge pull request #2145 from TkTech/patch-1
authorKenneth Reitz <me@kennethreitz.org>
Tue, 22 Jul 2014 20:20:37 +0000 (16:20 -0400)
committerKenneth Reitz <me@kennethreitz.org>
Tue, 22 Jul 2014 20:20:37 +0000 (16:20 -0400)
Update faq.rst


Trivial merge