* 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.
* upstream/master:
These should go into other gitignores, like Vim.gitignore
Added Wordpress (Forgot to 'git add .')
Added Vim >= 7.3 persistent undo files
Added few files to OSX.gitignore
Conflicts:
Global/OSX.gitignore
* upstream/master:
added rerun and config ignores
Add Haskell gitignore
Added ExpressionEngine gitignore file.
Fixed comment in Objective-C.gitignore
Fixed comments in C++.gitignore
Fixed comments in Archives.gitignore
Fixed comment in Linux.gitignore file
Small cleanup of comments in the file