Merge commit 'refs/pull/3725/head' of https://github.com/magento/magento2 into MAGETWO-52472

Hayder Sharhan · Hayder Sharhan · commit b66a362974ba · 2016-05-04T14:59:43.000-05:00
diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,7 @@
 atlassian*
 /nbproject
 /sitemap
+/sitemap.xml
 /.idea
 /.gitattributes
 /app/config_sandbox
