Merge branch 'beta' of git://github.com/metabrainz/musicbrainz-server into beta
MBS-5819: Instrument select in relat. editor requires accents
MBS-5799: Relationship editor doesn't allow adding multiple relationships with different attributes
MBS-5821: i18n: work types are untranslatable inside the relationship editor
Merge remote-tracking branch 'bitmap/mbs-5799' into beta

* bitmap/mbs-5799:
  MBS-5799: Relationship editor doesn't allow adding multiple relationships with different attributes
Merge remote-tracking branch 'bitmap/mbs-5819' into beta

* bitmap/mbs-5819:
  MBS-5819: Instrument select in relat. editor requires accents
Merge remote-tracking branch 'bitmap/mbs-5821' into beta

* bitmap/mbs-5821:
  MBS-5821: i18n: work types are untranslatable inside the relationship editor
Merge branch 'beta' of github.com:metabrainz/musicbrainz-server into beta

# By Ian McEwen (27) and others
# Via Ian McEwen (12) and others
* 'beta' of github.com:metabrainz/musicbrainz-server: (39 commits)
  MBS-5339/MBS-5490: update default cover art archive download prefix
  Revert "Merge remote-tracking branch 'sputnik/mbs-5388-new' into beta" (MBS-5881)
  MBS-5880: properly change an arrayref to an array for wikipedia extracts
  MBS-4947: generatesql update
  MBS-5520: Escape dollar sign in template to unbreak tests.
  MBS-5759: add proper includes to unbreak tests
  Update translations from transifex.
  Update mb_server.pot
  Update tests in light of Edit Medium display data changes.
  display bug: colspan=2 on the edit medium tracklist changes table
  Revert "Merge remote-tracking branch 'lordsputnik/mbs-5388' into beta"
  MBS-5828: remove chrome frame entirely
  MBS-5520: remove extra level of indirection for some links whose text needs to be translated along with their containing string
  refactor relationship grouping code a bit
  MBS-5825: 404 on integer overflows for entity rowIDs
  From bitmap - fixes change direction issues.
  MBS-5836: validate entity types against link types in relationship editor
  Fixed observable assignment error.
  This should give an error if entities aren't distinct.
  MBS-4094: improve macro code
  ...

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.