[wordpress/el6: 3/3] Merge branch 'f18' into el6

[Matej Cepl]

commit 7d431b92a0dc0cd54f99347234bdba81ea6228ee
Merge: 2d17158 4c00505
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Wed Dec 12 15:18:19 2012 +0100

    Merge branch 'f18' into el6
    
    Conflicts:
    	.gitignore
    	wordpress.spec

 .gitignore     |    2 +-
 sources        |    2 +-
 wordpress.spec |   59 ++++++++++++++++++++++++++++++++++++++++++++++---------
 3 files changed, 51 insertions(+), 12 deletions(-)
---