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

[mooninite]

commit a71da862f153695e3fcbb4544c475f19ea0d6a82
Merge: d3d7f51 c3b2d5c
Author: Michael Cronenworth <mike at cchtml.com>
Date:   Sat Jul 27 11:06:14 2013 -0500

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

 mediawiki.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc mediawiki.spec
index 3eb2950,f61e5c7..4d03b3d
--- a/mediawiki.spec
+++ b/mediawiki.spec
@@@ -1,7 -1,7 +1,7 @@@
  Summary: A wiki engine
  Name: mediawiki
  Version: 1.21.1
--Release: 4%{?dist}
++Release: 5%{?dist}
  License: GPLv2+
  URL: http://www.mediawiki.org/
  Source0: http://download.wikimedia.org/mediawiki/1.21/mediawiki-%{version}.tar.gz
@@@ -107,9 -107,9 +107,12 @@@ echo /var/www/wiki > %{buildroot}%{_sys
  
  
  %changelog
- * Sat Jul 27 2013 Michael Cronenworth <mike at cchtml.com> - 1.21.1-4
++* Sat Jul 27 2013 Michael Cronenworth <mike at cchtml.com> - 1.21.1-5
 +- Update mw-createinstance
 +
+ * Wed Jul 17 2013 Petr Pisar <ppisar at redhat.com> - 1.21.1-4
+ - Perl 5.18 rebuild
+ 
  * Wed Jul 10 2013 Michael Cronenworth <mike at cchtml.com> - 1.21.1-3
  - Fix Obsoletes