pidgin/pidgin

Merge with no conflicts.
release-2.x.y
2014-01-13, Mark Doliner
3214e5d99b41
Merge with no conflicts.
soundsdir = $(datadir)/sounds/purple
sounds_DATA = \
alert.wav \
login.wav \
logout.wav \
receive.wav \
send.wav
EXTRA_DIST = \
Makefile.mingw \
$(sounds_DATA)