3 commits

Author	SHA1	Message	Date
Spigot	754e2b5680	Upstream merge + remove 3 pulled patches. ... By: md_5 <md_5@live.com.au>	2013-09-12 10:17:46 +10:00
Spigot	3eb0f032f0	Upstream merge ... By: md_5 <md_5@live.com.au>	2013-08-07 17:16:57 +10:00
Spigot	62b3a909d9	Catch conversation API errors so that plugins don't silently malfunction. ... By: md_5 <md_5@live.com.au>	2013-07-22 19:10:02 +10:00