Merged in default (pull request #653)

Add PURPLE_VERSION and PURPLE_EXTRA_VERSION to libpurple/version.h and clean up some other related stuff

Approved-by: Elliott Sales de Andrade
Approved-by: John Bailey