#4180 was placed in the wrong milestone
Merge pull request #4230 from Flaburgan/patch-1

#4180 was placed in the wrong milestone
Merge pull request #4229 from davexunit/4227-private-message-error

Check for nil before splitting contact_ids param in ConversationsController
tweak readme [ci skip]

* Drop remaining links to the Github wiki
* Redirect Mailing list links through the wiki
* Update links that are redirects
* enable syntaxhighlighting
update all wiki links
Show avatar of recent user in conversation list
Fix hashtags that start a line when posting to Facebook or Twitter, by applying all the same options to strip_markdown as applying to markdownify, fixes #3768 and #4154
Merge pull request #4240 from jaywink/3768-hashmark-first-character

Fix hashtags that start a line when posting to Facebook or Twitter
Merge pull request #4244 from svbergerem/4237-consistent-conversation-list

Show avatar of recent user in conversation list

Conflicts:
	Changelog.md
fixed #cat-footer overlay
Updated the Galician (gl) translation
Merge pull request #4260 from Gallaecio/gl

Updated the Galician (gl) translation
bump recommended Ruby version to 1.9.3-p448

See http://www.ruby-lang.org/en/news/2013/06/27/hostname-check-bypassing-vulnerability-in-openssl-client-cve-2013-4073/
Drop weird stop in conversations controller spec
... and make the specs actually pass
Improve participants link style in conversation, close #4236

Move it to the right and replace the text by an image with the nice tooltip, modify the test.
Merge pull request #4238 from Flaburgan/patch-4

Improve participants link style, close #4236
remove restriction on guid length
Merge pull request #4249 from MrZYX/prepare_uuid

Remove restriction on guid length
updated 37 locale files [ci skip]