From e0732573a4c4381df143331eb487ad2920d8f31f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Chans=C3=A9aume?= <jchanseaume@openstudio.fr>
Date: Tue, 8 Jul 2014 15:33:07 +0200
Subject: [PATCH 1/2] updated changelog

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6131b9805..9231b5d36 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,10 @@
 - New feature: Product Brands / Suppliers management
 - New 'brand' loop and substitution. product, image and document loop have been updated.
 - Images and document processing have been refactored.
+- Added store description field for SEO
+- Added code editor on textarea on email templates page
+- Fixed issues on position tests
+- Fixed issues on RSS feed links
 
 #2.0.2
 - Coupon UI has been redesigned.

From 46c124b519721fa9c0291676f738902b2cc40f11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Chans=C3=A9aume?= <jchanseaume@openstudio.fr>
Date: Tue, 8 Jul 2014 15:33:42 +0200
Subject: [PATCH 2/2] sanitized store description

---
 templates/frontOffice/default/layout.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/frontOffice/default/layout.tpl b/templates/frontOffice/default/layout.tpl
index 66354fd7b..e2d113c18 100644
--- a/templates/frontOffice/default/layout.tpl
+++ b/templates/frontOffice/default/layout.tpl
@@ -51,7 +51,7 @@ GNU General Public License : http://www.gnu.org/licenses/
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     {block name="meta"}
-        <meta name="description" content="{if $page_description}{$page_description}{else}{$store_description}{/if}">
+        <meta name="description" content="{if $page_description}{$page_description}{else}{$store_description|strip|truncate:120}{/if}">
         <meta name="robots" content="noindex,nofollow">
     {/block}