[mb-commits] branch, master, updated. Merge branch 'mbs-321-annotations' Various improvements to the annotation role

[MusicBrainz Git Server]

The branch, master has been updated
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=6c576880aa81d867b05ea4d00086c837e2982d45 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=21fa8dbb0633338c2d172fb160a0dfad72afdf21 (commit)
      from  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=6167cf0049bb51e10509e9e775194dc9d3f787a0 (commit)

Summary of changes:
 lib/MusicBrainz/Server/Controller.pm               |    7 ++++++-
 .../Server/Controller/Role/Annotation.pm           |   19 ++++++++++---------
 lib/MusicBrainz/Server/Entity/Annotation.pm        |    2 +-
 root/annotation/common.tt                          |    4 ++--
 root/artist/annotation_revision.tt                 |    4 ++++
 root/edit/details/add_artist_annotation.tt         |    2 +-
 root/edit/details/add_label_annotation.tt          |    2 +-
 root/edit/details/add_recording_annotation.tt      |    2 +-
 root/edit/details/add_release_annotation.tt        |    2 +-
 root/edit/details/add_release_group_annotation.tt  |    2 +-
 root/edit/details/add_work_annotation.tt           |    2 +-
 root/label/annotation_revision.tt                  |    4 ++++
 root/recording/annotation_revision.tt              |    4 ++++
 root/release/annotation_revision.tt                |    4 ++++
 root/release_group/annotation_revision.tt          |    4 ++++
 root/work/annotation_revision.tt                   |    4 ++++
 16 files changed, 49 insertions(+), 19 deletions(-)
 create mode 100644 root/artist/annotation_revision.tt
 create mode 100644 root/label/annotation_revision.tt
 create mode 100644 root/recording/annotation_revision.tt
 create mode 100644 root/release/annotation_revision.tt
 create mode 100644 root/release_group/annotation_revision.tt
 create mode 100644 root/work/annotation_revision.tt

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 6c576880aa81d867b05ea4d00086c837e2982d45
Merge: 6167cf0 21fa8db
Author: Oliver Charles <oliver.g.charles at googlemail.com>
Date:   Sun Feb 14 11:41:20 2010 +0000

    Merge branch 'mbs-321-annotations'
    
    * mbs-321-annotations:
      Various improvements to the annotation role


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


hooks/post-receive
-- 
mb_server