HADOOP-6080 is going to 0.20.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@789876 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -154,9 +154,6 @@ Trunk (unreleased changes)
 
     HADOOP-3315. Add a new, binary file foramt, TFile. (Hong Tang via cdouglas)
 
-    HADOOP-6080. Introduce -skipTrash option to rm and rmr.
-    (Jakob Homan via shv)
-
   IMPROVEMENTS
 
     HADOOP-4565. Added CombineFileInputFormat to use data locality information
@@ -871,6 +868,9 @@ Release 0.20.1 - Unreleased
 
   NEW FEATURES
 
+    HADOOP-6080. Introduce -skipTrash option to rm and rmr.
+    (Jakob Homan via shv)
+
   IMPROVEMENTS
 
     HADOOP-5711. Change Namenode file close log to info. (szetszwo)