Merge remote-tracking branch 'origin/master' into 2.2

Conflicts: CHANGELOG.markdown
pusher · Jan 14, 2014 · 2fb69e6 · 2fb69e6
2 parents bd0af86 + a029958
commit 2fb69e6
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/CHANGELOG.markdown b/CHANGELOG.markdown
@@ -16,7 +16,7 @@
 
 [FIXED] Issue with SockJS streaming not being able to reconnect
 
-## 2.1.6 (2013-01-09)
+## 2.1.6 (2014-01-09)
 
 [NEW] Ping on offline events to detect disconnections quicker