pidgin/android/libpurple

pidgin/android/libpurple/
Merge with no conflicts
release-2.x.y
2013-02-13, Mark Doliner
47c90e633067