comparison libpurple/privacy.c @ 32768:f01d6c9f3492

explicit merge of 'c5b3879b829a5067b2189e4393ca3b80f6fd96c3' and '90634d4a19f4639f388839e3efc46791f1ee31ab' to branch 'im.pidgin.pidgin'
author Richard Laager <rlaager@wiktel.com>
date Fri, 06 Apr 2012 04:30:00 +0000
parents f75041cb3fec
children
comparison
equal deleted inserted replaced
32750:cc258d58ee56 32768:f01d6c9f3492