[mb-commits] branch, beta, updated. Merge branch 'mbs-5477-fix' into beta MBS-5477: remove use of iso_code_for_di...

The branch, beta has been updated
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=3139b9274ebd70622821dfc0bd6c6a4961ccc1af (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=7c0210be7d96d40d69c54bdd3d54f0b28253a155 (commit)
      from  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=aea7f79a12df01b5ca4d56bd52bbd43ea886b7c7 (commit)

Summary of changes:
 root/search/lib/inline-results-artist.tt |    2 +-
 1 files changed, 1 insertions(+), 1 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 3139b9274ebd70622821dfc0bd6c6a4961ccc1af
Merge: aea7f79 7c0210b
Author: Ian McEwen <[email protected]>
Date:   Tue Nov 27 12:28:32 2012 -0700

    Merge branch 'mbs-5477-fix' into beta


commit 7c0210be7d96d40d69c54bdd3d54f0b28253a155
Author: Ian McEwen <[email protected]>
Date:   Fri Nov 16 03:19:37 2012 -0700

    MBS-5477: remove use of iso_code_for_display, conflicting tickets in last release

diff --git a/root/search/lib/inline-results-artist.tt b/root/search/lib/inline-results-artist.tt
index 2533258..ccd103c 100644
--- a/root/search/lib/inline-results-artist.tt
+++ b/root/search/lib/inline-results-artist.tt
@@ -24,7 +24,7 @@
         <td>[% result.entity.l_type_name  %]</td>
         <td>[% result.entity.l_gender_name  %]</td>
         <td>
-            <abbr title="[% result.entity.country.l_name %]">[% result.entity.country.iso_code_for_display %]</abbr>
+            <abbr title="[% result.entity.country.l_name %]">[% result.entity.country.iso_code %]</abbr>
         </td>
         <td>[% result.entity.begin_date.format %]</td>
         <td>

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


hooks/post-receive
-- 
mb_server