Updated .gitignore (#1859)

* Magento logo directory added to .gitignore

* Added media/wysiwyg to .gitignore

* Added media/favicon to .gitignore

* Added media/email/logo to .gitignore

* Added mergedirs to .gitignore

Author: midlan

.gitignore

@@ -1,5 +1,13 @@
 /app/etc/local.xml
 /media/catalog
 /media/captcha
+/media/css
+/media/css_secure
+/media/email/logo
+/media/favicon
+/media/js
+/media/sales/store/logo
+/media/sales/store/logo_html
+/media/wysiwyg
 /dev/tests/functional/generated
 /dev/tests/functional/vendor