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

[Robert Scheck]

commit e9d2b90c90f9b3461ad2b6598316ddb2dbf94665
Merge: 9065edf f300fa3
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Mon Mar 21 16:58:29 2011 +0100

    Merge remote branch 'origin/master' into el6

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