Recent changes

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/net/branches/NET_2_0@963346 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index b086cac..6dabb0c 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -12,11 +12,16 @@
 Changes in this version include:
 
 New features:
+o NET-244:  Add support for FTPFileFilter filters. New classes FTPFileFilter, FTPFileFilters, new methods:
+            FTPListParseEngine#getFiles(FTPFileFilter filter)
+            FTPClient.listFiles(String pathname, FTPFileFilter filter) 
 o NET-74:  Testcase to show WindowSizeOptionHandler is working OK 
 o NET-263:  SubnetUtils / SubNetInfo toString() implementations 
 o Javadoc fixes, improvements, and refactoring. 
 
 Fixed Bugs:
+o NET-313:  Optionally enable EPSV with IPv4; Only send EPRT with IPv6.
+            Fix incorrect port used with EPRT. Allow activeMaxPort == activeMinPort in getActivePort() method. 
 o NET-328:  FromNetASCIIInputStream.read(byte[], int, int) may change length passed to superclass if not doing conversion 
 o NET-330:  The method VMSFTPEntryParser.parseFileList(InputStream listStream) should not be present.
             Mark method as deprecated and to be removed 
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 145fabc..4b228b8 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -61,6 +61,15 @@
  
   TO BE COMPLETED
 ">
+            <action issue="NET-244" dev="sebb" type="add">
+            Add support for FTPFileFilter filters. New classes FTPFileFilter, FTPFileFilters, new methods:
+            FTPListParseEngine#getFiles(FTPFileFilter filter)
+            FTPClient.listFiles(String pathname, FTPFileFilter filter)
+            </action>
+            <action issue="NET-313" dev="sebb" type="fix">
+            Optionally enable EPSV with IPv4; Only send EPRT with IPv6.
+            Fix incorrect port used with EPRT. Allow activeMaxPort == activeMinPort in getActivePort() method.
+            </action>
             <action issue="NET-328" dev="sebb" type="fix">
             FromNetASCIIInputStream.read(byte[], int, int) may change length passed to superclass if not doing conversion
             </action>