Merge branch 'magento-1.6-beta' into magento-1.6

winman · Oct 19, 2011 · ce07759 · ce07759
2 parents d54fe93 + 461a8c3
commit ce07759
Show file tree

Hide file tree

Showing 731 changed files with 28,164 additions and 13,610 deletions.
diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt
diff --git a/app/Mage.php b/app/Mage.php
@@ -152,7 +152,7 @@ public static function getVersionInfo()
         return array(
             'major'     => '1',
             'minor'     => '6',
-            'revision'  => '0',
+            'revision'  => '1',
             'patch'     => '0',
             'stability' => '',
             'number'    => '',

diff --git a/app/code/community/Find/Feed/Block/Adminhtml/Edit/Codes/Edit/Form.php b/app/code/community/Find/Feed/Block/Adminhtml/Edit/Codes/Edit/Form.php
diff --git a/app/code/community/Find/Feed/Block/Adminhtml/List/Codes/Grid.php b/app/code/community/Find/Feed/Block/Adminhtml/List/Codes/Grid.php