/pidgin/main: 841168b115f7: Merge release-2.x.y branch into master.

[Mark Doliner]

Changeset: 841168b115f7b5ddd2256b06150c826d219eca71
Author:	 Mark Doliner <mark at kingant.net>
Date:	 2015-04-24 14:54 -0700
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/841168b115f7

Description:

Merge release-2.x.y branch into master.

FYI this is the command I used:
  hg merge release-2.x.y

It's good to do this frequently when changes are made to the release-2.x.y
branch. If you wait a long time then the merge becomes difficult. There
could be many changes and if there are merge conflicts it's hard to know
which things should be kept.

In this case I think the changes in the release-2.x.y branch already
existed in master, so there are no changes. I believe that running the
merge command makes a note in the revision history that "changes from
release-2.x.y have been merged in master." So the next time someone does
the merge it'll start from this revision.