[phpMyAdmin/el6/master: 2/2] Merge remote branch 'origin/master' into el6

[Robert Scheck]

commit a52885abad8344d53fff2c0df7e5bc559da34dfa
Merge: 21e84c0 b5976e3
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Fri Oct 29 22:05:31 2010 +0200

    Merge remote branch 'origin/master' into el6

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