[wordpress/f13/master: 12/12] Merge branch 'f14' into f13

[Jon Ciesla]

commit d53770ea42fff3995b9bbf5e43851fb854915f69
Merge: 6ad0713 ea38f9f
Author: Jon Ciesla <limb at jcomserv.net>
Date:   Mon Mar 21 09:34:43 2011 -0500

    Merge branch 'f14' into f13

 .gitignore                           |    5 +++
 README.fedora.wordpress-mu           |    5 +++
 sources                              |    2 +-
 wordpress-debian_patches_hello.patch |   11 +++---
 wordpress.spec                       |   58 +++++++++++++++++++++++++--------
 5 files changed, 60 insertions(+), 21 deletions(-)
---