Merge remote-tracking branch 'fbrennan/pycon-docstrings-7329' into usage-docstring-formatting-7329

git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/branches/usage-docstring-formatting-7329@43150 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb