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

[Robert Scheck]

commit 48ebd3eb80881d2f129e19bd947131c9dd7e04dc
Merge: 3c0e981 038f61a
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Thu Feb 10 23:38:04 2011 +0100

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

 phpMyAdmin.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc phpMyAdmin.spec
index e3c9f5f,0a3ffae..5e26063
--- a/phpMyAdmin.spec
+++ b/phpMyAdmin.spec
@@@ -69,9 -69,9 +69,12 @@@ rm -rf %{buildroot
  %dir %attr(0755,apache,apache) %{_localstatedir}/lib/%{name}/config
  
  %changelog
 +* Thu Feb 10 2011 Robert Scheck <robert at fedoraproject.org> 3.3.9.1-1
 +- Upstream released 3.3.9.1
 +
+ * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.3.9-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ 
  * Mon Jan 03 2011 Robert Scheck <robert at fedoraproject.org> 3.3.9-1
  - Upstream released 3.3.9 (#666925)