/soc/2015/mmcc/main: 43c18d537a7e: merge with pidgin/main

[Michael McConville]

Changeset: 43c18d537a7eb09a6e9a1feb1b412ce379a9abe4
Author:	 Michael McConville <mmcconville at mykolab.com>
Date:	 2015-06-23 17:40 -0400
Branch:	 default
URL: https://hg.pidgin.im/soc/2015/mmcc/main/rev/43c18d537a7e

Description:

merge with pidgin/main