Merge remote branch 'upstream/master'

d2s · d2s · commit fef6ee31cbdd · 2010-11-23T00:20:29.000+02:00
* upstream/master:
  These should go into other gitignores, like Vim.gitignore
  Added Wordpress (Forgot to 'git add .')
  Added Vim &gt;= 7.3 persistent undo files
  Added few files to OSX.gitignore

Conflicts:
	Global/OSX.gitignore
diff --git a/Global/vim.gitignore b/Global/vim.gitignore
@@ -1 +1,2 @@
 .*.sw[a-z]
+*.un~
diff --git a/Wordpress.gitignore b/Wordpress.gitignore
@@ -0,0 +1,3 @@
+.htaccess
+wp-config.php
+wp-content/uploads/

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+.htaccess`
	`2`	`+wp-config.php`
	`3`	`+wp-content/uploads/`