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

[Jon Ciesla]

commit 6ad0713bb39cd028b19884087b7b3a224a109477
Merge: f051692 4985115
Author: Jon Ciesla <limb at jcomserv.net>
Date:   Tue Jan 11 11:02:00 2011 -0600

    Merge branch 'f14' into f13

 wordpress-2.8.6-r17172.patch |   92 ++++++++++++++++++++++++++++++++++++++++++
 wordpress.spec               |    8 +++-
 2 files changed, 99 insertions(+), 1 deletions(-)
---