Upstream merge.

This commit is contained in:
md_5 2015-01-05 14:32:01 +11:00 committed by Zach Brown
parent 6ae735e2e3
commit 384699a51a
188 changed files with 247 additions and 253 deletions

View file

@ -1,4 +1,4 @@
From 9c26aff6ec01941005bcfed3a874560fd020c6f0 Mon Sep 17 00:00:00 2001
From 417f3bb34fb6fca6451bd36e5795a6d18581238c Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Mon, 22 Jul 2013 19:09:43 +1000
Subject: [PATCH] Catch Conversation API Errors