Merged in rw_grim/pidgin (pull request #3)

2015-12-23, Gary Kramlich