Merge branch 'master' into issues

James Moger

2012-01-13 0256e6aa26ebb51416d290d772897caf84a1cd82

 src/com/gitblit/client/FeedsPanel.java

@@ -42,8 +42,8 @@
import javax.swing.event.ListSelectionListener;

import javax.swing.table.TableRowSorter;



import com.gitblit.models.FeedModel;

import com.gitblit.models.FeedEntryModel;

import com.gitblit.models.FeedModel;

import com.gitblit.utils.StringUtils;



/**