From d271fac5b6b27296a5c9e36e42ca585c8f308662 Mon Sep 17 00:00:00 2001
From: Allan Jardine <allan.jardine@sprymedia.co.uk>
Date: Wed, 19 Mar 2014 10:53:44 +0000
Subject: [PATCH] Merge branch 'master' of github.com:DataTables/DataTablesSrc

---
 .datatables-commit-sync       | 2 +-
 media/js/jquery.dataTables.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.datatables-commit-sync b/.datatables-commit-sync
index dbc89560..7ff05bd6 100644
--- a/.datatables-commit-sync
+++ b/.datatables-commit-sync
@@ -1 +1 @@
-5163edd378fd86020a43a1b5a21ed8732bd92990
+2380313b30b913d6909d88166fc77746a019e717
diff --git a/media/js/jquery.dataTables.js b/media/js/jquery.dataTables.js
index 0558a543..5adb80c9 100644
--- a/media/js/jquery.dataTables.js
+++ b/media/js/jquery.dataTables.js
@@ -2291,7 +2291,7 @@
 				if ( error == "parsererror" ) {
 					log( oSettings, 0, 'Invalid JSON response', 1 );
 				}
-				else {
+				else if ( xhr.readyState === 4 ) {
 					log( oSettings, 0, 'Ajax error', 7 );
 				}