Merge branch 'ticket/211' into develop

James Moger

2014-10-26 3faf6f6469759538590aa7f1012c543f95583c56

 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