pidgin/android/libpurple

Merge the 2.x.y branch into default.

2013-04-03, Mark Doliner
9d172d15a45f
Merge the 2.x.y branch into default.
No conflicts.