[mb-commits] branch, beta, updated. Merge branch 'mbs-4568' into beta MBS-4568, remove <bdi> from a html attribut...

The branch, beta has been updated
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=786cc4354a8269f987776dc51edcd5240f13451c (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=cd18b74cc198b002918548aa144a2c66cf09f32e (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=b948fd9de002efda93cc3896d44d2119e8daf103 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=5a826ee98cd8b7594cd3010882efe8af287fef93 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=ce8267f674b8d203d2f0e2cf1480257d798b6cea (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=d3bb04315f284bd3b9a02b10ab21ca97e186b6f2 (commit)
      from  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=3b673e3232c5ac60031717495a01fb5f55e55539 (commit)

Summary of changes:
 lib/MusicBrainz/Server/Controller/WS/2/CDStub.pm   |    2 +-
 .../Server/Controller/WS/2/Collection.pm           |    2 +-
 lib/MusicBrainz/Server/Controller/WS/2/DiscID.pm   |    3 +-
 lib/MusicBrainz/Server/Controller/WS/2/FreeDB.pm   |    2 +-
 lib/MusicBrainz/Server/Controller/WS/2/ISRC.pm     |    3 +-
 lib/MusicBrainz/Server/Controller/WS/2/PUID.pm     |    3 +-
 lib/MusicBrainz/Server/Controller/WS/2/Tag.pm      |    2 +-
 lib/MusicBrainz/Server/Data/WebService.pm          |    6 +++-
 root/components/common-macros.tt                   |   28 ++++++++++----------
 9 files changed, 28 insertions(+), 23 deletions(-)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 786cc4354a8269f987776dc51edcd5240f13451c
Merge: cd18b74 ce8267f
Author: warp <[email protected]>
Date:   Wed Nov 28 09:36:01 2012 +0100

    Merge branch 'mbs-4568' into beta
    
    * mbs-4568:
      MBS-4568, remove <bdi> from a html attribute, where it is not valid html.
      Revert "Revert "Add <bdi> around a bunch of strings coming from the db (MBS-4568)""


commit cd18b74cc198b002918548aa144a2c66cf09f32e
Merge: 3b673e3 b948fd9
Author: warp <[email protected]>
Date:   Wed Nov 28 09:35:49 2012 +0100

    Merge branch 'mbs-5317' into beta
    
    * mbs-5317:
      MBS-5317, Get the decoded content from LWP instead of decoding it ourselves.
      MBS-5317, support fmt=json for searches


-----------------------------------------------------------------------


hooks/post-receive
-- 
mb_server