[Python-checkins] cpython (merge 3.5 -> default): Merge from 3.5

[berker.peksag]

https://hg.python.org/cpython/rev/7d648e17989f
changeset:   101955:7d648e17989f
parent:      101953:8a0fe3481c91
parent:      101954:f2fa78d4d46b
user:        Berker Peksag <berker.peksag at gmail.com>
date:        Sun Jun 12 19:18:17 2016 +0300
summary:
  Merge from 3.5

files:
  Modules/_sqlite/module.h |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Modules/_sqlite/module.h b/Modules/_sqlite/module.h
--- a/Modules/_sqlite/module.h
+++ b/Modules/_sqlite/module.h
@@ -42,7 +42,7 @@
 extern PyObject* time_time;
 extern PyObject* time_sleep;
 
-/* A dictionary, mapping colum types (INTEGER, VARCHAR, etc.) to converter
+/* A dictionary, mapping column types (INTEGER, VARCHAR, etc.) to converter
  * functions, that convert the SQL value to the appropriate Python value.
  * The key is uppercase.
  */

-- 
Repository URL: https://hg.python.org/cpython