# HG changeset patch # User Marcus Lundblad # Date 1282763688 0 # Node ID 4c050b6e9bd14d8259eabba5b756521abd8d1595 # Parent 797c03de8fa95ce1639213dd54168b9cc6eba780 Removed an extra newline in that snuck in in ChangeLog during merge. diff -r 797c03de8fa9 -r 4c050b6e9bd1 ChangeLog --- a/ChangeLog Wed Aug 25 19:13:24 2010 +0000 +++ b/ChangeLog Wed Aug 25 19:14:48 2010 +0000 @@ -8,7 +8,6 @@ * Added ability to use TURN relaying via TCP and TLS (including preference settings for these). - Yahoo/Yahoo JAPAN: * Stop doing unnecessary lookups of certain alias information. This solves deadlocks when a given Yahoo account has a ridiculously large