added Waf.gitignore
Merge remote branch 'upstream/master'

* upstream/master:
  added Waf.gitignore
  Don't ignore empty files meant to preserve the file structure of an application within a git repository for later deployment
  Ignore files generated by Etags and Ctags
  Performance Sessions & Reports.
  Visual C++ additions.
  Added ignore patterns for projects generated using seam-gen
  add Coq gitignore
  dont track compiled elisp
  Added a VB.Net gitignore
  Added to Drupal.gitignore
  add "*.tmproject" to ignore list
  Added patterns for LaTeX Beamer
  Add in rules for WP Super Cache, Google XML Sitemaps, and WP-DBManager plugins.
  Add OCaml gitignore
  Add CVS gitignore for anyone who has to code-share with projects using CVS. Save the dinosaurs.
  Add SVN gitignore for anyone who has to code-share with projects using Subversion
  Fix typo in CodeIgniter gitignore
  Added Drupal gitignore.
Removed empty line from Autotools.gitignore
Haskell.gitignore: ignore files produced by c2hs
Merge https://github.com/github/gitignore

Conflicts:
	Global/VisualStudio.gitignore
Removed duplicate settings.php.
Added ZendFramework.gitignore.
added Mercurial.gitignore
ignore dvi intermediate output
ignore nlo intermediate output
ignore lof intermediate output
.gitignore for gcov files
Merge remote branch 'mrtazz/update_latex_ignores'
Added LaTeX temp files for List of Tables (*.lot files).
Symfony2 gitignore

Ignore application logs/cache, uploads and published bundle assets.
added Mercurial.gitignore
Ignore all the .svn folders.
Ignoring db, logs, server.pid
Added since RIA/Silverlight projects use this for generated code that doesn't get added into source control.
.gitignore for gcov files