Merge branch 'ticket/137' into develop

James Moger

2014-07-05 34d7d04aa8a1a7706be333f5eb0a4aec7f066850

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

@@ -37,7 +37,7 @@


   /**

    * The constructor for a federation set.

    * 
    *

    * @param name

    *            the name of this federation set

    * @param tokenType