Add verbose logging to MemcacheLock
Add extra logging when voting
Add thread id to lock logging
Merge branch 'lock-leak-log' into stable
Update cap-tasks
Merge branch 'staging' into stable
Disable lock logging
Fix exception when viewing comment markup help
Merge branch 'staging' into stable
Add verbose logging to MemcacheLock
Add extra logging when voting
Add thread id to lock logging
Prevent log messages from stomping on each other
Make sure we can see memcache errors
Merge branch 'lock-leak-log' into staging
Merge branch 'staging' into stable

Conflicts:
	r2/r2/lib/lock.py
Update user RSS feed path as a result of wiki user profiles

[#43363351]
Ignore tags file
Merge branch 'staging' into stable
Merge branch 'stable'

Conflicts:
	r2/r2/models/vote.py