[mediawiki-validator: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/mediawiki-validator

[James Laska]

commit 33e03ebae2cf948757dc2b97ecdb23ccfc3266ab
Merge: 05854b6 cc29d7c
Author: James Laska <jlaska at redhat.com>
Date:   Thu Mar 7 09:26:47 2013 -0500

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/mediawiki-validator
    
    Conflicts:
    	mediawiki-validator.spec

---