[mb-commits] branch, beta, updated. Merge remote-tracking branch 'navap/mbs-5758-remove-swag' into beta MBS-5758:...

The branch, beta has been updated
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=db728dbbbf23f9e3068666c5987797da286d3dc7 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=adf7adfbb03dcebccb63cac7cba1510e20e3ab5d (commit)
      from  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=5fe216b9ebc8d7850634d5b5a863f815b03b5f04 (commit)

Summary of changes:
 root/layout.tt |    3 +--
 1 files changed, 1 insertions(+), 2 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 db728dbbbf23f9e3068666c5987797da286d3dc7
Merge: 5fe216b adf7adf
Author: warp <[email protected]>
Date:   Mon Jan 21 12:25:54 2013 +0100

    Merge remote-tracking branch 'navap/mbs-5758-remove-swag' into beta
    
    * navap/mbs-5758-remove-swag:
      MBS-5758: Remove swag link


commit adf7adfbb03dcebccb63cac7cba1510e20e3ab5d
Author: Pavan Chander <[email protected]>
Date:   Thu Jan 17 22:24:25 2013 -0500

    MBS-5758: Remove swag link

diff --git a/root/layout.tt b/root/layout.tt
index b248f60..5f28507 100644
--- a/root/layout.tt
+++ b/root/layout.tt
@@ -151,8 +151,7 @@
                 <a href="http://wiki.musicbrainz.org/" class="internal">[% l('Wiki') %]</a> |
                 <a href="http://forums.musicbrainz.org/" class="internal">[% l('Forums') %]</a> |
                 <a href="http://tickets.musicbrainz.org/" class="internal">[% l('Bug Tracker') %]</a> |
-                <a href="http://twitter.com/MusicBrainz" class="internal">[% l('Twitter') %]</a> |
-                <a href="http://www.cafepress.com/musicbrainz" class="internal">[% l('Schwag') %]</a>
+                <a href="http://twitter.com/MusicBrainz" class="internal">[% l('Twitter') %]</a>
             </p>
 
             <p class="right">

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


hooks/post-receive
-- 
mb_server