merge of '910705fa47d724ab861e8a348d50d2d4c97dddfe'

Replace a notification that should never happen with a debug message that

ChangeLog the Escape closes conversation window preference.

When an XMPP account is set to require TLS, but libpurple doesn't have SSL

Remove the stored installer language selection when uninstalling.

Add this ChangeLog item back, the merge ate it.

merge of '212075e27ec152e5b39c7aa86ad0576f659fbad8'

Add a tickybox to set the 'close conversation window' shortcut to Escape.

Don't count the size of an array at runtime if it's known at compile time.

Change the string "screen name" to "username" everywhere. I think most

(0) -10000 -3000 -1000 -300 -100 -10 +10 +100 +300 +1000 +3000 +10000 tip

mercurial