Merged revisions 234055 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
  r234055 | russell | 2009-12-09 17:35:24 -0600 (Wed, 09 Dec 2009) | 2 lines
  
  Move an entry from CHANGES to UPGRADE.txt.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@234056 65c4cc65-6c06-0410-ace0-fbb531ad65f3

CHANGES

@@ -128,9 +128,6 @@ Miscellaneous
 -------------
  * The Asterisk CLI has a new command, "channel redirect", which is similar in
    operation to the AMI Redirect action.
- * res_jabber: autoprune has been disabled by default, to avoid misconfiguration 
-   that would end up being interpreted as a bug once Asterisk started removing 
-   the contacts from a user list.
  * extensions.conf now allows you to use keyword "same" to define an extension
    without actually specifying an extension.  It uses exactly the same pattern
    as previously used on the last "exten" line.  For example:

UPGRADE.txt

@@ -119,6 +119,10 @@ From 1.6.1 to 1.6.2:
 * DAHDISendCallreroutingFacility() parameters are now comma-separated,
   instead of the old pipe.
 
+* res_jabber: autoprune has been disabled by default, to avoid misconfiguration 
+  that would end up being interpreted as a bug once Asterisk started removing 
+  the contacts from a user list.
+
 From 1.6.0.1 to 1.6.1:
 
 * The ast_agi_register_multiple() and ast_agi_unregister_multiple()