Add unittest to check that session cookie set at logout is httponly
Escape add-on search string on "add to collection" (bug 780438)
prevent xss from UserProfile.display_name on admin deletion (bug 835827)
don't leak information on username/password when recaptcha is invalid on login page (bug 802771)
csrf protect delete_icon view in bandwagon (bug 967529)
Add a unique index between application and version on AppVersion (bug 1007544)
Don't leak if email is known on password reset (bug 700599)
Merge pull request #81 from davidbgk/master

Right memcached class in documentation
Merge pull request #78 from magopian/1007544-prevent-appversions-duplicates

Add a unique index between application and version on AppVersion (bug 1007544)
Revert "Cleanup some monkey patching."

This reverts commit 5cb34cdab4da971fc76b33de4581cddb301bfbe3.
Revert "upgrade Django to version 1.6.4"

This reverts commit b2ac4033c1a5dbd7c1cb27a092b9718d53854854.
revert 4f08587a740ae4 because unique key makes many tests fixtures sad (bug 1007544)
Merge branch 'httponly_session_cookie' of github.com:mozilla/olympia-security
Merge branch 'bug700599' of github.com:mozilla/olympia-security
Merge branch 'bug780438' of github.com:mozilla/olympia-security
Merge branch '835827-xss-deleting-account' of github.com:mozilla/olympia-security
Merge branch '802771-useless-recaptcha' of github.com:mozilla/olympia-security
Merge branch '967529-collection-icon-delete-csrf' of github.com:mozilla/olympia-security
add proper default