Merge non-fast-forward for release branch merges

James Moger

2014-06-16 35bb2253c9ff0dcc44f3245026a141fde6415153

 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