Merge branch 'ticket/171' into develop

James Moger

2014-09-08 805f8878b9457d41f277c81ff8d6e64b5d494903

 src/main/java/com/gitblit/models/FederationProposal.java

@@ -37,14 +37,14 @@
   public FederationToken tokenType;



   public String token;

	


   public String message;



   public Map<String, RepositoryModel> repositories;



   /**

    * The constructor for a federation proposal.

    * 
    *

    * @param url

    *            the url of the source Gitblit instance

    * @param tokenType