From a6264e06352bbf70cafa834432d18168eef03d76 Mon Sep 17 00:00:00 2001
From: theraven <theraven@72102866-910b-0410-8b05-ffd578937521>
Date: Mon, 25 Jul 2011 15:51:16 +0000
Subject: [PATCH] Added ChangeLog entry from last commit

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@33632 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 950013c84..44c57e40a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2011-07-25 15:50  David Chisnall <theraven@gna.org>
+
+	* libs/base/trunk/Headers/Foundation/Foundation.h,
+	  libs/base/trunk/Headers/Foundation/NSJSONSerialization.h,
+	  libs/base/trunk/Source/GNUmakefile,
+	  libs/base/trunk/Source/NSJSONSerialization.m,
+	  libs/base/trunk/Tests/base/NSJSONSerialization,
+	  libs/base/trunk/Tests/base/NSJSONSerialization/TestInfo,
+	  libs/base/trunk/Tests/base/NSJSONSerialization/json.m: Added
+	  NSJSONSerialization (10.7) implementation. The code path reading
+	  from an NSInputStream is not well tested - please try and break
+	  it!
+
 2011-07-25 Fred Kiefer <FredKiefer@gmx.de>
 
 	* libs/base/trunk/Headers/GNUstepBase/GSIMap.h