[wordpress-mu/f13/master: 4/4] Merge branch 'f14' into f13

[Jon Ciesla]

commit 68315a75f236b1f0d6d6029bd85e9aac90549ac5
Merge: 0dea7f8 57ba998
Author: Jon Ciesla <limb at jcomserv.net>
Date:   Thu Dec 23 10:01:21 2010 -0600

    Merge branch 'f14' into f13
    
    Conflicts:
    	.gitignore

 .gitignore                      |    2 +-
 sources                         |    2 +-
 wordpress-mu-2.9.2-r16625.patch |    9 +++++++++
 wordpress-mu.spec               |   28 +++++++++++++++++++---------
 4 files changed, 30 insertions(+), 11 deletions(-)
---
diff --cc .gitignore
index 6ced768,5bac55a..02d21e0
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--wordpress-mu-2.9.1.1.tar.gz
 -/wordpress-mu-2.9.2.tar.gz
++wordpress-mu-2.9.2.tar.gz