Merge branch 'master' into issues

James Moger

2012-01-13 0256e6aa26ebb51416d290d772897caf84a1cd82

 src/com/gitblit/client/SubscriptionsDialog.java

@@ -57,7 +57,7 @@
   public SubscriptionsDialog(List<FeedModel> registrations) {

      super();

      this.feeds = registrations;

      setTitle(Translation.get("gb.manage"));

      setTitle(Translation.get("gb.subscribe"));

      setIconImage(new ImageIcon(getClass().getResource("/gitblt-favicon.png")).getImage());

      initialize();

      setSize(600, 400);