pidgin/old.pidgin.im

pidgin/old.pidgin.im/
Merge with no conflicts

2013-02-13, Mark Doliner
ee1240a98935