We should be using the type listed in the response, not in the

Fix merge.

merge of 'e278c8a035e1f288e5e4524eba1a04af1aa25d4b'

merge of 'ca703c2df180df44021bddeb9ae22c148cdcae2e'

merge of '4b650ff83b2d140964b25c08d840e39f7efb2918'

disapproval of revision '7b467feaf4fe2d9c29751b1ad4483571ad9eafe5'

jabber: Only make the SRV lookup for STUN based on the domain if no STUN

Look for non-null before processing theme input. Closes #10521 (again).

Mark strings for translation.

Search friends by email addresses in the buddylist.

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

mercurial