commit 34e4628453a01330a41c0d0baddc1408a38e5de4
author Stefan Krah <skrah@bytereef.org> Mon Jan 20 15:35:38 2014 +0100
committer Stefan Krah <skrah@bytereef.org> Mon Jan 20 15:35:38 2014 +0100
tree a70a8348bcecc3e14c599034b670f6f4f4b81ecf
parent 5a6d4bf671699152fb417e8f8ba899aa5e1d8d42
parent 6c01e38677550839d10b558b1a9e0e615d6e4a81

Merge from 3.3.

Misc/ACKS

diff --git a/Misc/ACKS b/Misc/ACKS
index 76cc888..b10fcc2 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -562,6 +562,7 @@
 Nadav Horesh
 Alon Horev
 Jan Hosang
+Alan Hourihane
 Ken Howard
 Brad Howes
 Mike Hoy

Python/fileutils.c

diff --git a/Python/fileutils.c b/Python/fileutils.c
index 814f076..a55064f 100644
--- a/Python/fileutils.c
+++ b/Python/fileutils.c
@@ -1,11 +1,12 @@
 #include "Python.h"
 #include "osdefs.h"
+#include <locale.h>
+
 #ifdef MS_WINDOWS
 #  include <windows.h>
 #endif
 
 #ifdef HAVE_LANGINFO_H
-#include <locale.h>
 #include <langinfo.h>
 #endif