guardianproject/Gibberbot — pull request #178 by devrandom (2012-10-06 19:48:36+00:00)
Title: Improve handling of presence conflict

Fixes issue #311

Depends on asmack as a submodule (pull the submodule request first).