Merge branch 'ticket/172' into develop

James Moger

2014-09-08 06255b33b3a3f843ddbb478fad222508b6214f53

 src/main/java/com/gitblit/manager/ServicesManager.java

@@ -510,7 +510,7 @@
      @Override
      public void reschedule(FederationModel registration) {
         // schedule the next pull
         int mins = TimeUtils.convertFrequencyToMinutes(registration.frequency);
         int mins = TimeUtils.convertFrequencyToMinutes(registration.frequency, 5);
         registration.nextPull = new Date(System.currentTimeMillis() + (mins * 60 * 1000L));
         scheduledExecutor.schedule(new FederationPuller(registration), mins, TimeUnit.MINUTES);
         logger.info(MessageFormat.format(