Merge, no conflicts release-2.x.y

Increase size of static buffer in gtkimhtml from 1KiB to 16KiB. release-2.x.y

Merge with release-2.x.y

ssl-nss: Fix handling of certificates without a Subject. release-2.x.y

Add some error checking for sscanf usage (there are more places that could use this) release-2.x.y

Clean up some unused stuff release-2.x.y

Add some sanity checking to guard against mismatched parameters. release-2.x.y

Clean up some unused stuff release-2.x.y

jabber: Correctly remove a failed SASL mech when it isn't the first in the list release-2.x.y

German translation update release-2.x.y

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

mercurial