pidgin/android/libpurple

pidgin/android/libpurple/
Merge with no conflicts
release-2.x.y
2013-02-18, Mark Doliner
5e1a2b90561c