prevent warning message about already defined constants
Update TROUBLESHOOTING.md
use HTTP URL to checkout active_model_serializers (fails during bundle)
Merge pull request #816 from ngpestelos/master

use HTTP URL to check out active_model_serializers
prevent duplicate actions on a post
cs translation update
keep French l10n up to date
use method name instead of __method__ (which is wrong in this situation on Debian Squeeze Ruby 1.9)
use symbols in redis proxy methods
Link to helpful article on Capistrano deployment

@SamSaffron mentioned in #809 he wouldn't mind me linking to a helpful
article on Capistrano deployment in those sample files. My totally
unbiased opinion is that the one I've committed here is the best one.
:wink:

Signed-off-by: David Celis <me@davidcel.is>
prepend the username in the participant alt-text in the topic list
Merge pull request #822 from ZogStriP/prepend-the-username-in-participants-title

prepend the username in the participant alt-text in the topic list
Merge pull request #821 from piglop/define-method-fix

Fix for Debian Ruby 1.9
remove pointless to_sym
Merge pull request #820 from ZogStriP/keep-french-l10n-up-to-date-2013-05-04

keep French l10n up to date [ci-skip]
Merge pull request #819 from kubabrecka/cs_update42

cs translation update
am serializer update
Merge branch 'master' of github.com:discourse/discourse
update psuedo locale
Merge pull request #817 from ZogStriP/prevent-duplicates-actions-on-a-post

prevent duplicate actions on a post