Merge pull request #1781 from mkutyba/master

Fixes for Magento

Magento.gitignore

 .htaccess.sample
 .modgit/
 .modman/
-app/code/community/Phoenix/
-app/code/community/Cm/
+app/code/community/Phoenix/Moneybookers/
+app/code/community/Cm/RedisSession/
 app/code/core/
 app/design/adminhtml/default/default/
 app/design/frontend/base/
@@ -14,26 +14,7 @@ app/design/frontend/default/modern/
 app/design/frontend/enterprise/default
 app/design/install/
 app/etc/modules/Enterprise_*
-app/etc/modules/Mage_All.xml
-app/etc/modules/Mage_Api.xml
-app/etc/modules/Mage_Api2.xml
-app/etc/modules/Mage_Authorizenet.xml
-app/etc/modules/Mage_Bundle.xml
-app/etc/modules/Mage_Captcha.xml
-app/etc/modules/Mage_Centinel.xml
-app/etc/modules/Mage_Compiler.xml
-app/etc/modules/Mage_ConfigurableSwatches.xml
-app/etc/modules/Mage_Connect.xml
-app/etc/modules/Mage_CurrencySymbol.xml
-app/etc/modules/Mage_Downloadable.xml
-app/etc/modules/Mage_ImportExport.xml
-app/etc/modules/Mage_LoadTest.xml
-app/etc/modules/Mage_Oauth.xml
-app/etc/modules/Mage_PageCache.xml
-app/etc/modules/Mage_Persistent.xml
-app/etc/modules/Mage_Weee.xml
-app/etc/modules/Mage_Widget.xml
-app/etc/modules/Mage_XmlConnect.xml
+app/etc/modules/Mage_*.xml
 app/etc/modules/Phoenix_Moneybookers.xml
 app/etc/modules/Cm_RedisSession.xml
 app/etc/applied.patches.list
@@ -43,10 +24,13 @@ app/etc/local.xml.additional
 app/etc/local.xml.template
 app/etc/local.xml
 app/.htaccess
-app/locale/
+app/bootstrap.php
+app/locale/en_US/
 app/Mage.php
 /cron.php
 cron.sh
+dev/.htaccess
+dev/tests/functional/
 downloader/
 errors/
 favicon.ico
@@ -90,14 +74,7 @@ LICENSE.html
 LICENSE.txt
 LICENSE_EE*
 /mage
-media/customer/
-media/dhl/
-media/downloadable/
-media/.htaccess
-media/import/
-media/xmlconnect/
-media/catalog/product/cache/
-media/catalog/product/placeholder/default/
+media/
 /api.php
 nbproject/
 pear
@@ -105,6 +82,7 @@ pear/
 php.ini.sample
 pkginfo/
 RELEASE_NOTES.txt
+shell/.htaccess
 shell/abstract.php
 shell/compiler.php
 shell/indexer.php