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

[Robert Scheck]

commit b15e9e48c2a9f4638cb66dc151cb2f9623ac92e7
Merge: 46a1327 99e376f
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Feb 13 03:31:50 2011 +0100

    Merge remote branch 'origin/master' into f13

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