From 090eb6075eac3a16974f6baed236875ee1dc8a90 Mon Sep 17 00:00:00 2001
From: Adam Jackett <adam@darkhousemedia.com>
Date: Sat, 23 Jul 2011 11:53:02 -0400
Subject: Merge changelog.

---
 user_guide/changelog.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 7779a690d..f5eb53aa3 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -102,6 +102,8 @@ Change Log
 	<li>Fixed a bug (Reactor #229) where the Sessions Library example SQL in the documentation contained incorrect SQL.</li>
 	<li>Fixed a bug (Core #340) where when passing in the second parameter to $this->db->select(), column names in subsequent queries would not be properly escaped.</li>
 	<li class="reactor">Fixed issue #199 - Attributes passed as string does not include a space between it and the opening tag.</li>
+	<li class="reactor">Fixed a bug where the method <kbd>$this->cart->total_items()</kbd> from <a href="libraries/cart.html">Cart Library</a> now returns the sum of the quantity of all items in the cart instead of your total count.</li>
+	<li class="reactor">Fixed a bug where not setting 'null' when adding fields in db_forge for mysql and mysqli drivers would default to NULL instead of NOT NULL as the docs suggest.</li>
 </ul>
 
 <h2>Version 2.0.2</h2>
-- 
cgit v1.2.3-24-g4f1b