/pidgin/main: 178560525be2: Fix a conflict

Gary Kramlich <[email protected]> Wed, 14 Sep 2016 15:54:40 -0400

Newsgroups	gmane.comp.gnome.gaim.cvs
Message-ID	<[email protected]>

Changeset: 178560525be2ab1ae7a4ffa84b4ac012e0c420f1
Author:	 Gary Kramlich <[email protected]>
Date:	 2016-09-09 09:28 -0500
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/178560525be2

Description:

Fix a conflict

_______________________________________________
Commits mailing list
[email protected]
https://pidgin.im/cgi-bin/mailman/listinfo/commits