qulogic/pidgin

qulogic/pidgin/share/
Manual merge release-2.x.y into master.

2014-09-12, Mark Doliner
bd402b3a86f4