Merge jcrygier's LDAP injection defense and displayname/email retrieval

James Moger

2012-04-25 d2426e1eb5d07664b5c26c4247fae3325282d60d

 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;



/**