Merge branch 'master' into rpc

James Moger

2011-10-02 f762b160efd5cafd919a6fd7f9587f578eceb454

 src/com/gitblit/wicket/panels/FederationTokensPanel.html

@@ -15,7 +15,7 @@
      <table class="repositories">

      <tr>

         <th class="left">

            <img style="vertical-align: top; border: 1px solid #888; background-color: white;" src="federated_16x16.png"/>

            <img style="vertical-align: middle; border: 1px solid #888; background-color: white;" src="federated_16x16.png"/>

            <wicket:message key="gb.tokens">[tokens]</wicket:message>

         </th>

         <th></th>