[mb-commits] branch, beta, updated. Merge remote-tracking branch 'origin/mbs-3072-json-work-type' into beta MBS-3...

The branch, beta has been updated
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=ad501205be4f6bc069697f2237bd846f84ba8151 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=d98ce0ac17d005ecfc21984951c9c7d4a3522280 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=7cb5e289eb93fe29df1801ac72a8c8d67caf43bf (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=f20513a87abb8a9b3618821d15159e5b72d32138 (commit)
      from  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=6e3ab21b83217ae87cb6070f1aa7e29e30644985 (commit)

Summary of changes:
 .../Server/WebService/Serializer/JSON/2/Work.pm    |    1 +
 .../Server/Controller/WS/2/JSON/BrowseWorks.pm     |   10 ++++++++++
 .../Server/Controller/WS/2/JSON/LookupArtist.pm    |   16 ++++++++++++++++
 .../Server/Controller/WS/2/JSON/LookupWork.pm      |    4 ++++
 .../Server/Controller/WS/2/LookupWork.pm           |    6 +++---
 t/sql/webservice.sql                               |    3 ++-
 6 files changed, 36 insertions(+), 4 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 ad501205be4f6bc069697f2237bd846f84ba8151
Merge: 6e3ab21 d98ce0a
Author: Oliver Charles <[email protected]>
Date:   Tue Dec 11 11:08:15 2012 +0000

    Merge remote-tracking branch 'origin/mbs-3072-json-work-type' into beta
    
    * origin/mbs-3072-json-work-type:
      MBS-3072, update tests with work type changes to test data.
      Revert previous work comment change.
      MBS-3072, work type should be included in the /ws/2 json output.


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


hooks/post-receive
-- 
mb_server