adium 2395:bd95ce6eaf7e: Update the master.

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/bd95ce6eaf7e
revision:	2395:bd95ce6eaf7e
author:		Zachary West <zacw at adium.im>
date:		Fri May 29 11:45:41 2009 -0400

Update the master.

diffs (11 lines):

diff -r 46c793b7ab93 -r bd95ce6eaf7e ChangeLogs/Changes.txt
--- a/ChangeLogs/Changes.txt	Fri May 29 11:44:13 2009 -0400
+++ b/ChangeLogs/Changes.txt	Fri May 29 11:45:41 2009 -0400
@@ -119,6 +119,7 @@
   * Fixed a bug where emoticons would be displayed improperly. (#6440)
   * Added a confirmation dialog when clicking the block/unblock icon in the toolbar. (#10960)
   * Added a URL shortener.  Select the URL, then either choose “Replace with Shortened URL” from the Edit menu, right-click the URL and choose it from that menu, right-click a link and choose it from that menu, or press ⇧⌘K. Supports TinyURL, is.gd, tr.im, and Metamark (xrl.us).
+  * Added an image uploader.  Select the image, then either choose “Replace with Uploaded Image” from the Edit menu, right-click the image and choose it from that menu, right-click a link and choose it from that menu, or press ⌥⌘K.
   * Nudge and buzz messages now appear as events in the window instead of messages from the contact.
   * Added an option to only count mentions for group chats when badging the dock or status menu item. (#11850)
   * Fixed clicking service links with message text when the link appears in the window it would open.