added one more email quote separator
Merge branch 'master' into user-questions-pagination
added optional display error message for failed ldap login
Removed redundant closing td tag

A redundant `</td> tag is added if screen names are editable.
This fixes the issue.

Also, matched the blocks indentation with that of the rest of the file.
Merge pull request #275 from ozbek/master

Removed redundant closing td tag
misplaced parenthese in forms.py
Merge pull request #276 from Grahack/patch-2

misplaced parenthese in a msg string in forms.py
Whitespace needed in LDAP msg string.
Rephrasing a msg string about OpenId

Not sure about the hidden meaning of this sentence!
Merge pull request #280 from Grahack/patch-5

Whitespace needed in LDAP msg string.
Merge pull request #281 from Grahack/patch-6

Rephrasing a msg string about OpenId
Whitespace needed in sidebar_question msg string.
Merge pull request #282 from Grahack/patch-7

Whitespace needed in sidebar_question msg string.
words.py queston -> question
Merge pull request #283 from Grahack/patch-8

words.py queston -> question
fixed unclosed html tag in the moderation queue template
Merge branch 'master' of github.com:ASKBOT/askbot-devel
Merge branch 'user-questions-pagination'
some cleanup
started work on merge duplicate threads feature