Merge pull request #1378 from rafaelstz/patch-4

Setup of the development environment.

Magento.gitignore

@@ -1,3 +1,4 @@
+.htaccess.sample
 .modgit/
 .modman/
 app/code/community/Phoenix/