Merge from gnulib.

This incorporates:
2012-08-29 stdbool: be more compatible with mixed C/C++ compiles
2011-11-30 manywarnings: update the list of "all" warnings

1 files changed, 6 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 62e64622d1..8af393d439 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-09-03  Paul Eggert  <[email protected]>
+
+	Merge from gnulib, incorporating:
+	2012-08-29 stdbool: be more compatible with mixed C/C++ compiles
+	2011-11-30 manywarnings: update the list of "all" warnings
+
 2012-09-02  Jan Djärv  <[email protected]>
 
 	* configure.ac (HAVE_GOBJECT): Check for gobject-2.0 (Bug#12332).