diff libpurple/cipher.c @ 29267:58e1e1463b6e

Manual merge
author Marcus Lundblad <ml@update.uu.se>
date Thu, 01 Jan 2009 21:16:19 +0000
parents 951bb9ca9d01
children a6e3cb32cdd2
line wrap: on
line diff