Merged to default to fix merge conflicts with custom marshaller removal

libpurple: Remove now unused GnuTLS and NSS references

libpurple: Remove PurpleCipher and PurpleHash implementations and tests

libpurple: Remove dangling cipher.h includes

smiley-list: Fix missing include for strstr()

caesarcipher: Remove in preparation of removing PurpleCipher

simple: Port NTLM to Nettle

internal-keyring: Port to Nettle

configure.ac: Add checks for Nettle (Crypto library)

Merged in dequisdequis/pidgin (pull request #222)

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

mercurial