/pidgin/main: 9d172d15a45f: Merge the 2.x.y branch into default.

[Mark Doliner]

Changeset: 9d172d15a45fcb03b83fc16d3d5117e3c1f2acee
Author:	 Mark Doliner <mark at kingant.net>
Date:	 2013-04-03 22:46 -0700
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/9d172d15a45f

Description:

Merge the 2.x.y branch into default.
No conflicts.