James Booth ca30ff3910 Merge branch 'master' into xep-0184 ... Conflicts: src/server_events.c src/ui/core.c src/ui/ui.h tests/ui/stub_ui.c		2015-03-14 23:10:51 +00:00
..
stub_ui.c	Merge branch 'master' into xep-0184	2015-03-14 23:10:51 +00:00
stub_ui.h	Added tests for clearing chat sessions on lost connection	2015-01-10 01:17:38 +00:00