GitLab

Thanks to Jacob Appelbaum for pointing it out!

Conflicts:
	ChangeLog

	otr-plugin.c: Some cleanup.

	packaging/windows/pidgin-otr.nsi: A couple small tweaks
	and updates to Windows packaging

	for win32 build.

	* otr-plugin.c: Avoiding storing values in g_hash_tables.
	Doing this improperly created issues in 64-bit
	environments.

	ensure conv is not NULL before dereferencing.

	* gtk-dialog.c:
	* gtk-ui.c:
	* otr-plugin.c:
	* otr-plugin.h:
	* ui.c: More changes for instance tags. Some logging-
	related changes too (output whether pidgin is logging,
	change default not to log otr conversations). -- Rob
	Smits

2009-06-11

	* gtk-dialog.c:
	* otr-plugin.c:
	* otr-plugin.h: Initial instance tags implementation
	from Lisa Du

	* po/vi.po: Vietnamese translation from Lyndon Johnson
	<lyndon.johnson58@gmail.com>