[wordpress/el6: 29/29] Merge branch 'master' into el6

[Matej Cepl]

commit a33f6d165d3d72cca60d262760bd88acee132607
Merge: 786cdfe 6e160d9
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Fri Jan 24 10:58:06 2014 +0100

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	sources
    	wordpress.spec

 .gitignore     |    1 +
 sources        |    2 +-
 wordpress.spec |    5 ++++-
 3 files changed, 6 insertions(+), 2 deletions(-)
---