merge back with HEAD for 7.7.0

2009-03-05 16:19:12 +00:00 · 2009-03-05 16:19:12 +00:00 · 04105713f0
commit 04105713f0
parent 426bc41b04
23 changed files with 120 additions and 60 deletions
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@ -1,3 +1,6 @@
+7.7.0
+ - fixed: Template parser cannot be set
+
 7.6.14
 - fixed: IE6 shows Admin Bar over Asset Manager
 - fixed #9808: Search i18n