3 commits

Author	SHA1	Message	Date
md_5	1b854cbe28	Upstream merge + remove 3 pulled patches.	2013-09-12 10:20:02 +10:00
md_5	e36ba8dd96	Upstream merge	2013-08-07 17:16:57 +10:00
md_5	755645cc23	Catch conversation API errors so that plugins don't silently malfunction.	2013-07-22 19:10:02 +10:00