Merge branch 'beta' of git://github.com/metabrainz/musicbrainz-server into beta
Merge branch 'beta' of git://github.com/metabrainz/musicbrainz-server into beta
MBS-5834, Fix the title and heading of the /user/:username/votes page.

Distinguish between:
1. a list of edits by $username
2. a list of edits $username has voted on
MBS-5851, include relationship attribute names in /ws/2 json output.
MBS-5851, test relationship attributes in the webservice tests.
MBS-5851, test recording -> work relationship output in json webservice.
Merge branch 'beta' of git://github.com/metabrainz/musicbrainz-server into beta
MBS-5834, Clarify that this page is the list of votes even though it looks like a list of edits.
Added a few Japanese blogs to autoselect
Merge branch 'beta' of bitbucket.org:metabrainz/musicbrainz-server into beta
MBS-6129: Relationship editor isn't correctly parsing attributes
fix relationship editor tests for MBS-6129
Adding some autoselect for discography entry sites
add QUnit test for MBS-6129
Fixing cleanup regex
Avoid people using release-level discography entry rels for wikipedia URLs
Fixing github + more correct name
move joinAttrs to MB.utility.joinList
fix tests
Merge remote-tracking branch 'warp/mbs-5851' into beta

* warp/mbs-5851:
  MBS-5851, test recording -> work relationship output in json webservice.
  MBS-5851, test relationship attributes in the webservice tests.
  MBS-5851, include relationship attribute names in /ws/2 json output.