pidgin/pidgin

Pull changes from ssh://hg@hg.pidgin.im/pidgin/main into the private

2014-06-17, Mark Doliner
c96cd4064dd3
Pull changes from ssh://hg@hg.pidgin.im/pidgin/main into the private
repo and merge heads.

Easy manual merge: Only conflicts were in ChangeLog.
if ENABLE_GTK_DOC
SUBDIRS = reference
endif
man_MANS =
if ENABLE_GTK
man_MANS += pidgin.1
endif
if ENABLE_GNT
man_MANS += finch.1
endif
EXTRA_DIST = \
PERL-HOWTO.dox \
TCL-HOWTO.dox \
funniest_home_convos.txt \
finch.1.in \
gtkrc-2.0 \
pidgin.1.in \
the_penguin.txt