From 3c2ab6c28eec682cb27cfa2bd8618325ba4c03a4 Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Wed, 18 Jan 2012 19:49:06 -0300
Subject: modified the changlog to reflect merge of new models

---
 askbot/doc/source/changelog.rst    | 1 +
 askbot/doc/source/contributors.rst | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/askbot/doc/source/changelog.rst b/askbot/doc/source/changelog.rst
index b4b810d6..b4f5ead7 100644
--- a/askbot/doc/source/changelog.rst
+++ b/askbot/doc/source/changelog.rst
@@ -3,6 +3,7 @@ Changes in Askbot
 
 Development version (not released yet)
 --------------------------------------
+* New data models!!! (`Tomasz Zieliński <http://pyconsultant.eu>`_)
 * Made email recovery link work when askbot is deployed on subdirectory (Evgeny)
 * Added tests for the CSRF_COOKIE_DOMAIN setting in the startup_procedures (Evgeny)
 * Askbot now respects django's staticfiles app (Radim Řehůřek, Evgeny)
diff --git a/askbot/doc/source/contributors.rst b/askbot/doc/source/contributors.rst
index 30e31175..a0b91518 100644
--- a/askbot/doc/source/contributors.rst
+++ b/askbot/doc/source/contributors.rst
@@ -11,6 +11,7 @@ Programming and documentation
 * Mike Chen & Sailing Cai - original authors of CNPROG forum
 * Evgeny Fadeev - founder of askbot
 * `Adolfo Fitoria <http://fitoria.net>`_
+* `Tomasz Zielinski <http://pyconsultant.eu/>`_
 * `Sayan Chowdhury <http://fosswithme.wordpress.com>`_
 * Andy Knotts
 * Benoit Lavine (with Windriver Software, Inc.)
@@ -27,7 +28,6 @@ Programming and documentation
 * `Arun SAG  <http://zer0c00l.in/>`_
 * `Rag Sagar <https://github.com/ragsagar>`_
 * `Alex Robbins <https://github.com/alexrobbins>`_
-* `Tomasz Zielinski <http://pyconsultant.eu/>`_
 * `Tomasz Szynalski <http://antimoon.com>`_
 * `Raghu Udiyar <http://raags.tumblr.com/>`_
 * `Alexander Werner <https://twitter.com/#!/bundeswerner>`_
-- 
cgit v1.2.3-1-g7c22